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

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 1061663003: Fixed logic for display of upgrade menu item. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit. Created 5 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 6724bcb9e63bb12e07fec6d1d3f5b4325c05c643..c47785e723613a39d84f6d37e4a61e07481d4dbe 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -757,7 +757,8 @@ bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
return false;
#endif
case IDC_UPGRADE_DIALOG:
- return UpgradeDetector::GetInstance()->notify_upgrade();
+ return browser_defaults::kShowUpgradeMenuItem &&
+ UpgradeDetector::GetInstance()->notify_upgrade();
#if !defined(OS_LINUX) || defined(USE_AURA)
case IDC_BOOKMARK_PAGE:
return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile());
@@ -840,7 +841,7 @@ void WrenchMenuModel::Build() {
ui::ResourceBundle::GetSharedInstance().
GetNativeImageNamed(IDR_INPUT_ALERT_MENU));
- if (IsCommandIdVisible(browser_defaults::kShowUpgradeMenuItem))
+ if (IsCommandIdVisible(IDC_UPGRADE_DIALOG))
AddItem(IDC_UPGRADE_DIALOG, GetUpgradeDialogMenuItemName());
if (AddGlobalErrorMenuItems() ||
« no previous file with comments | « no previous file | chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698