Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Unified Diff: mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml

Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1 (Closed)
Patch Set: Created Nov. 26, 2015, 11:01 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mobile/android/base/resources/menu-v11/browser_app_menu.xml ('k') | mobile/android/base/resources/menu/browser_app_menu.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
diff --git a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
index 45968774053cfd1fa4e9e7e700481fd9293a36e2..459a5ae9b635ba066e98726f0f86e9c60cc7ebee 100644
--- a/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
+++ b/mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
@@ -60,6 +60,11 @@
android:icon="@drawable/ic_menu_find_in_page"
android:title="@string/find_in_page" />
+ <item android:id="@+id/abb_block_ads"
+ android:title="@string/abb_block_ads"
+ android:enabled="false"
+ android:checkable="true" />
+
<item android:id="@+id/desktop_mode"
android:icon="@drawable/ic_menu_desktop_mode_off"
android:title="@string/desktop_mode"
@@ -103,6 +108,7 @@
<item android:id="@+id/addons"
android:icon="@drawable/ic_menu_addons"
+ android:visible="false"
android:title="@string/addons"/>
<item android:id="@+id/logins"
@@ -132,6 +138,7 @@
android:title="@string/settings" />
<item android:id="@+id/help"
+ android:visible="false"
android:title="@string/help_menu" />
</menu>
« no previous file with comments | « mobile/android/base/resources/menu-v11/browser_app_menu.xml ('k') | mobile/android/base/resources/menu/browser_app_menu.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld