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

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

Issue 11440020: Add an outdated upgrade bubble view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed OWNERS comments... Created 7 years, 10 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 | « chrome/browser/ui/browser_commands.cc ('k') | chrome/browser/ui/views/outdated_upgrade_bubble_view.h » ('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 2b3d7aaba4150830c650a8b4a414ef006beb4956..54f6b150c4383e7318c4b42753a4082590d7ad44 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -70,6 +70,20 @@ using content::HostZoomMap;
using content::UserMetricsAction;
using content::WebContents;
+namespace {
+// Conditionally return the update app menu item title based on upgrade detector
+// state.
+string16 GetUpgradeDialogMenuItemName() {
+ if (UpgradeDetector::GetInstance()->is_outdated_install()) {
+ return l10n_util::GetStringFUTF16(
+ IDS_UPGRADE_BUBBLE_MENU_ITEM,
+ l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
+ } else {
+ return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
+ }
+}
+} // namespace
+
////////////////////////////////////////////////////////////////////////////////
// EncodingMenuModel
@@ -285,7 +299,7 @@ string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
num_background_pages);
}
case IDC_UPGRADE_DIALOG:
- return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
+ return GetUpgradeDialogMenuItemName();
case IDC_SHOW_SIGNIN:
return signin_ui_util::GetSigninMenuLabel(
browser_->profile()->GetOriginalProfile());
@@ -568,7 +582,8 @@ void WrenchMenuModel::Build(bool is_new_menu, bool supports_new_separators) {
}
if (browser_defaults::kShowUpgradeMenuItem)
- AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringUTF16(IDS_UPDATE_NOW));
+ AddItem(IDC_UPGRADE_DIALOG, GetUpgradeDialogMenuItemName());
+
AddItem(IDC_VIEW_INCOMPATIBILITIES, l10n_util::GetStringUTF16(
IDS_VIEW_INCOMPATIBILITIES));
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | chrome/browser/ui/views/outdated_upgrade_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698