The "Update Chrome" menu item should appear in addition to the About menu.

chrome/browser/wrench_menu_model.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "app/l10n_util.h"
@@ skipping 176 matching lines @@
                  NotificationService::AllSources());
 }
 
 WrenchMenuModel::~WrenchMenuModel() {
   if (tabstrip_model_)
     tabstrip_model_->RemoveObserver(this);
 }
 
 bool WrenchMenuModel::IsLabelForCommandIdDynamic(int command_id) const {
   return command_id == IDC_ZOOM_PERCENT_DISPLAY ||
-         command_id == IDC_SYNC_BOOKMARKS ||
 #if defined(OS_MACOSX)
          command_id == IDC_FULLSCREEN ||
 #endif
-         command_id == IDC_ABOUT;
+         command_id == IDC_SYNC_BOOKMARKS;
 }
 
 string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
   switch (command_id) {
-    case IDC_ABOUT:
-      return GetAboutEntryMenuLabel();
     case IDC_SYNC_BOOKMARKS:
       return GetSyncMenuLabel();
     case IDC_ZOOM_PERCENT_DISPLAY:
       return zoom_label_;
 #if defined(OS_MACOSX)
     case IDC_FULLSCREEN: {
       int string_id = IDS_ENTER_FULLSCREEN_MAC;  // Default to Enter.
       // Note: On startup, |window()| may be NULL.
       if (browser_->window() && browser_->window()->IsFullscreen())
         string_id = IDS_EXIT_FULLSCREEN_MAC;
@@ skipping 21 matching lines @@
     return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
   }
 
   return false;
 }
 
 bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const {
   return browser_->command_updater()->IsCommandEnabled(command_id);
 }
 
+bool WrenchMenuModel::IsCommandIdVisible(int command_id) const {
+  if (command_id == IDC_UPGRADE_DIALOG)
+    return Singleton<UpgradeDetector>::get()->notify_upgrade();
+  return true;
+}
+
 bool WrenchMenuModel::GetAcceleratorForCommandId(
       int command_id,
       menus::Accelerator* accelerator) {
   return provider_->GetAcceleratorForCommandId(command_id, accelerator);
 }
 
 void WrenchMenuModel::TabSelectedAt(TabContents* old_contents,
                                     TabContents* new_contents,
                                     int index,
                                     bool user_gesture) {
@@ skipping 100 matching lines @@
     AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
 #else
   AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
 #endif
 
 #if defined(OS_CHROMEOS)
   AddCheckItemWithStringId(IDC_TOGGLE_VERTICAL_TABS,
                            IDS_TAB_CXMENU_USE_VERTICAL_TABS);
 #endif
 
-  // TODO(erg): This entire section needs to be reworked and is out of scope of
-  // the first cleanup patch I'm doing. Part 1 (crbug.com/47320) is moving most
-  // of the logic from each platform specific UI code into the model here. Part
-  // 2 (crbug.com/46221) is normalizing the about menu item/hidden update menu
-  // item behaviour across the three platforms.
+  // On Mac, there is no About item.
+  if (browser_defaults::kShowAboutMenuItem) {
+    AddItem(IDC_ABOUT, l10n_util::GetStringFUTF16(
+        IDS_ABOUT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  }
 
-  // On Mac, there is no About item unless it is replaced with the update
-  // available notification.
-  if (browser_defaults::kShowAboutMenuItem ||
-      Singleton<UpgradeDetector>::get()->notify_upgrade()) {
-    AddItem(IDC_ABOUT,
-            l10n_util::GetStringFUTF16(
-                IDS_ABOUT,
-                l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
-    // ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    // SetIcon(GetIndexOfCommandId(IDC_ABOUT),
-    //                *rb.GetBitmapNamed(IDR_UPDATE_AVAILABLE));
-  }
+  AddItem(IDC_UPGRADE_DIALOG, l10n_util::GetStringFUTF16(
+      IDS_UPDATE_NOW, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  SetIcon(GetIndexOfCommandId(IDC_UPGRADE_DIALOG),
+          *rb.GetBitmapNamed(IDR_UPDATE_AVAILABLE));
+
   AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   if (browser_defaults::kShowExitMenuItem) {
     AddSeparator();
 #if defined(OS_CHROMEOS)
     AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
 #else
     AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 #endif
   }
 }
@@ skipping 39 matching lines @@
       std::max(std::min(std::pow(1.2, zoom_level), 3.0), .5));
   *enable_decrement = (value != .5);
   *enable_increment = (value != 3.0);
   return value;
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   return sync_ui_util::GetSyncMenuLabel(
       browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
 }
-
-string16 WrenchMenuModel::GetAboutEntryMenuLabel() const {
-  if (Singleton<UpgradeDetector>::get()->notify_upgrade()) {
-    return l10n_util::GetStringFUTF16(
-        IDS_UPDATE_NOW, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-  }
-  return l10n_util::GetStringFUTF16(
-      IDS_ABOUT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-}