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 d77e397df17835465623ec7ab4667a5f135197b4..041ebbb40cede296de6ace4721bd9f69331255a9 100644 |
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc |
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc |
@@ -81,6 +81,18 @@ namespace { |
// Maximum width of a username - we trim emails that are wider than this so |
// the wrench menu doesn't get ridiculously wide. |
const int kUsernameMaxWidth = 200; |
+ |
+// 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 |
//////////////////////////////////////////////////////////////////////////////// |
@@ -292,7 +304,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: { |
GlobalError* error = GetActiveSignedInServiceError(); |
if (error) |
@@ -605,7 +617,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)); |