Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(568)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java

Issue 1505913003: Add update menu item and app menu icon badge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rearrange field_trial.. again to facilitate command line testing Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.appmenu; 5 package org.chromium.chrome.browser.appmenu;
6 6
7 import android.text.TextUtils; 7 import android.text.TextUtils;
8 import android.view.Menu; 8 import android.view.Menu;
9 import android.view.MenuItem; 9 import android.view.MenuItem;
10 10
11 import org.chromium.chrome.R; 11 import org.chromium.chrome.R;
12 import org.chromium.chrome.browser.ChromeActivity; 12 import org.chromium.chrome.browser.ChromeActivity;
13 import org.chromium.chrome.browser.ChromeBrowserProviderClient; 13 import org.chromium.chrome.browser.ChromeBrowserProviderClient;
14 import org.chromium.chrome.browser.ShortcutHelper; 14 import org.chromium.chrome.browser.ShortcutHelper;
15 import org.chromium.chrome.browser.UrlConstants; 15 import org.chromium.chrome.browser.UrlConstants;
16 import org.chromium.chrome.browser.bookmark.BookmarksBridge; 16 import org.chromium.chrome.browser.bookmark.BookmarksBridge;
17 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge; 17 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
18 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
18 import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils; 19 import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
19 import org.chromium.chrome.browser.preferences.PrefServiceBridge; 20 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
20 import org.chromium.chrome.browser.share.ShareHelper; 21 import org.chromium.chrome.browser.share.ShareHelper;
21 import org.chromium.chrome.browser.tab.Tab; 22 import org.chromium.chrome.browser.tab.Tab;
22 import org.chromium.chrome.browser.util.FeatureUtilities; 23 import org.chromium.chrome.browser.util.FeatureUtilities;
23 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils; 24 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
24 import org.chromium.printing.PrintingController; 25 import org.chromium.printing.PrintingController;
25 26
26 /** 27 /**
27 * App Menu helper that handles hiding and showing menu items based on activity state. 28 * App Menu helper that handles hiding and showing menu items based on activity state.
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 bookmarkMenuItem.setIcon(R.drawable.btn_star_filled); 104 bookmarkMenuItem.setIcon(R.drawable.btn_star_filled);
104 bookmarkMenuItem.setChecked(true); 105 bookmarkMenuItem.setChecked(true);
105 bookmarkMenuItem.setTitleCondensed(mActivity.getString(R.str ing.edit_bookmark)); 106 bookmarkMenuItem.setTitleCondensed(mActivity.getString(R.str ing.edit_bookmark));
106 } else { 107 } else {
107 bookmarkMenuItem.setIcon(R.drawable.btn_star); 108 bookmarkMenuItem.setIcon(R.drawable.btn_star);
108 bookmarkMenuItem.setChecked(false); 109 bookmarkMenuItem.setChecked(false);
109 bookmarkMenuItem.setTitleCondensed(null); 110 bookmarkMenuItem.setTitleCondensed(null);
110 } 111 }
111 } 112 }
112 113
114 menu.findItem(R.id.update_menu_id).setVisible(
115 UpdateMenuItemHelper.getInstance().shouldShowMenuItem(mActiv ity));
116
113 // Hide "Recent tabs" in incognito mode or when sync can't be enable d. 117 // Hide "Recent tabs" in incognito mode or when sync can't be enable d.
114 MenuItem recentTabsMenuItem = menu.findItem(R.id.recent_tabs_menu_id ); 118 MenuItem recentTabsMenuItem = menu.findItem(R.id.recent_tabs_menu_id );
115 recentTabsMenuItem.setVisible(!isIncognito && FeatureUtilities.canAl lowSync(mActivity)); 119 recentTabsMenuItem.setVisible(!isIncognito && FeatureUtilities.canAl lowSync(mActivity));
116 recentTabsMenuItem.setTitle(R.string.menu_recent_tabs); 120 recentTabsMenuItem.setTitle(R.string.menu_recent_tabs);
117 121
118 if (OfflinePageBridge.isEnabled()) { 122 if (OfflinePageBridge.isEnabled()) {
119 MenuItem allBookmarksMenuItem = menu.findItem(R.id.all_bookmarks _menu_id); 123 MenuItem allBookmarksMenuItem = menu.findItem(R.id.all_bookmarks _menu_id);
120 allBookmarksMenuItem.setTitle(mActivity.getString( 124 allBookmarksMenuItem.setTitle(mActivity.getString(
121 R.string.menu_bookmarks_offline_pages)); 125 R.string.menu_bookmarks_offline_pages));
122 } 126 }
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 245
242 /** 246 /**
243 * Updates the bookmarks bridge. 247 * Updates the bookmarks bridge.
244 * 248 *
245 * @param bookmarksBridge The bookmarks bridge. 249 * @param bookmarksBridge The bookmarks bridge.
246 */ 250 */
247 public void setBookmarksBridge(BookmarksBridge bookmarksBridge) { 251 public void setBookmarksBridge(BookmarksBridge bookmarksBridge) {
248 mBookmarksBridge = bookmarksBridge; 252 mBookmarksBridge = bookmarksBridge;
249 } 253 }
250 } 254 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698