Unified Diff: mobile/android/base/resources/menu-large-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.
« no previous file with comments
|
« mobile/android/base/resources/layout/tabs_item_row.xml ('k')
|
mobile/android/base/resources/menu-v11/browser_app_menu.xml » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/base/resources/menu-large-v11/browser_app_menu.xml |
| diff --git a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml |
| index 2da54115053d30fc83970090d1c7092e723bd90b..7ff04a776ac58374b66e284e073e65a07f6b409c 100644 |
| --- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml |
| +++ b/mobile/android/base/resources/menu-large-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" |
| @@ -102,6 +107,7 @@ |
| <item android:id="@+id/addons" |
| android:icon="@drawable/ic_menu_addons" |
| + android:visible="false" |
| android:title="@string/addons"/> |
| <item android:id="@+id/logins" |
| @@ -131,6 +137,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/layout/tabs_item_row.xml ('k')
|
mobile/android/base/resources/menu-v11/browser_app_menu.xml » ('j')
|
no next file with comments »
