Revert "Clean up the WrenchMenuModel so that it uses SimpleMenu::Delegate." (r57119)

TBR=rsesek

Review URL: http://codereview.chromium.org/3163035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57128 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 243 insertions, 217 deletions

diff --git a/app/menus/accelerator.h b/app/menus/accelerator.h
index 0509c14..def6cf2 100644
--- a/app/menus/accelerator.h
+++ b/app/menus/accelerator.h
@@ -68,20 +68,6 @@ class Accelerator {
   int modifiers_;
 };
 
-// Since acclerator code is one of the few things that can't be cross platform
-// in the chrome UI, separate out just the GetAcceleratorForCommandId() from
-// the menu delegates.
-class AcceleratorProvider {
- public:
-  virtual ~AcceleratorProvider() {}
-
-  // Gets the accelerator for the specified command id. Returns true if the
-  // command id has a valid accelerator, false otherwise.
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      menus::Accelerator* accelerator) = 0;
-};
-
 }
 
 #endif  // APP_MENUS_ACCELERATOR_H_
diff --git a/chrome/browser/cocoa/toolbar_controller.h b/chrome/browser/cocoa/toolbar_controller.h
index 43420cc..68b57bf 100644
--- a/chrome/browser/cocoa/toolbar_controller.h
+++ b/chrome/browser/cocoa/toolbar_controller.h
@@ -28,7 +28,7 @@ class LocationBar;
 class LocationBarViewMac;
 @class MenuButton;
 namespace ToolbarControllerInternal {
-class WrenchAcceleratorDelegate;
+class MenuDelegate;
 class NotificationBridge;
 }  // namespace ToolbarControllerInternal
 class Profile;
@@ -74,8 +74,7 @@ class WrenchMenuModel;
   // Lazily-instantiated model and delegate for the menu on the
   // wrench button.  Once visible, it will be non-null, but will not
   // reaped when the menu is hidden once it is initially shown.
-  scoped_ptr<ToolbarControllerInternal::WrenchAcceleratorDelegate>
-      acceleratorDelegate_;
+  scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_;
   scoped_ptr<WrenchMenuModel> wrenchMenuModel_;
 
   // Used for monitoring the optional toolbar button prefs.
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index b100b56..57b0e38 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -95,9 +95,24 @@ const CGFloat kWrenchMenuLeftPadding = 3.0;
 
 namespace ToolbarControllerInternal {
 
-// A C++ delegate that handles the accelerators in the wrench menu.
-class WrenchAcceleratorDelegate : public menus::AcceleratorProvider {
+// A C++ delegate that handles enabling/disabling menu items and handling when
+// a menu command is chosen.
+class MenuDelegate : public menus::SimpleMenuModel::Delegate {
  public:
+  explicit MenuDelegate(Browser* browser)
+      : browser_(browser) { }
+
+  // Overridden from menus::SimpleMenuModel::Delegate
+  virtual bool IsCommandIdChecked(int command_id) const {
+    if (command_id == IDC_SHOW_BOOKMARK_BAR) {
+      return browser_->profile()->GetPrefs()->GetBoolean(
+          prefs::kShowBookmarkBar);
+    }
+    return false;
+  }
+  virtual bool IsCommandIdEnabled(int command_id) const {
+    return browser_->command_updater()->IsCommandEnabled(command_id);
+  }
   virtual bool GetAcceleratorForCommandId(int command_id,
       menus::Accelerator* accelerator_generic) {
     // Downcast so that when the copy constructor is invoked below, the key
@@ -113,6 +128,26 @@ class WrenchAcceleratorDelegate : public menus::AcceleratorProvider {
     }
     return false;
   }
+  virtual void ExecuteCommand(int command_id) {
+    browser_->ExecuteCommand(command_id);
+  }
+  virtual bool IsLabelForCommandIdDynamic(int command_id) const {
+    // On Mac, switch between "Enter Full Screen" and "Exit Full Screen".
+    return (command_id == IDC_FULLSCREEN);
+  }
+  virtual string16 GetLabelForCommandId(int command_id) const {
+    if (command_id == 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;
+      return l10n_util::GetStringUTF16(string_id);
+    }
+    return menus::SimpleMenuModel::Delegate::GetLabelForCommandId(command_id);
+  }
+
+ private:
+  Browser* browser_;
 };
 
 // A class registered for C++ notifications. This is used to detect changes in
@@ -512,12 +547,10 @@ class NotificationBridge : public NotificationObserver {
 - (void)installWrenchMenu {
   if (wrenchMenuModel_.get())
     return;
-  acceleratorDelegate_.reset(
-      new ToolbarControllerInternal::WrenchAcceleratorDelegate());
+  menuDelegate_.reset(new ToolbarControllerInternal::MenuDelegate(browser_));
 
-  wrenchMenuModel_.reset(new WrenchMenuModel(
-      acceleratorDelegate_.get(), browser_));
-  [wrenchMenuController_ setWrenchMenuModel:wrenchMenuModel_.get()];
+  wrenchMenuModel_.reset(new WrenchMenuModel(menuDelegate_.get(), browser_));
+  [wrenchMenuController_ setModel:wrenchMenuModel_.get()];
   [wrenchMenuController_ setUseWithPopUpButtonCell:YES];
   [wrenchButton_ setAttachedMenu:[wrenchMenuController_ menu]];
 }
@@ -545,6 +578,8 @@ class NotificationBridge : public NotificationObserver {
   [overlayImage unlockFocus];
 
   [[wrenchButton_ cell] setOverlayImage:overlayImage];
+
+  [wrenchMenuController_ insertUpdateAvailableItem];
 }
 
 - (void)prefChanged:(std::string*)prefName {
diff --git a/chrome/browser/cocoa/wrench_menu_controller.h b/chrome/browser/cocoa/wrench_menu_controller.h
index 65d32fc9..99f3743 100644
--- a/chrome/browser/cocoa/wrench_menu_controller.h
+++ b/chrome/browser/cocoa/wrench_menu_controller.h
@@ -40,16 +40,12 @@ class ZoomLevelObserver;
   IBOutlet NSButton* zoomMinus_;
   IBOutlet NSButton* zoomFullScreen_;
 
-  WrenchMenuModel* wrench_model_;
-
   scoped_ptr<WrenchMenuControllerInternal::ZoomLevelObserver> observer_;
 }
 
 // Designated initializer; called within the NIB.
 - (id)init;
 
-- (void)setWrenchMenuModel:(WrenchMenuModel*)model;
-
 // Used to dispatch commands from the Wrench menu. The custom items within the
 // menu cannot be hooked up directly to First Responder because the window in
 // which the controls reside is not the BrowserWindowController, but a
@@ -59,6 +55,9 @@ class ZoomLevelObserver;
 // Returns the weak reference to the WrenchMenuModel.
 - (WrenchMenuModel*)wrenchMenuModel;
 
+// Inserts the update available notification menu item.
+- (void)insertUpdateAvailableItem;
+
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/cocoa/wrench_menu_controller.mm b/chrome/browser/cocoa/wrench_menu_controller.mm
index 11d40a2..4966157 100644
--- a/chrome/browser/cocoa/wrench_menu_controller.mm
+++ b/chrome/browser/cocoa/wrench_menu_controller.mm
@@ -63,11 +63,6 @@ class ZoomLevelObserver : public NotificationObserver {
   return self;
 }
 
-- (void)setWrenchMenuModel:(WrenchMenuModel*)model {
-  wrench_model_ = model;
-  [self setModel:model->menu_model()];
-}
-
 - (void)addItemToMenu:(NSMenu*)menu
               atIndex:(NSInteger)index
             fromModel:(menus::MenuModel*)model
@@ -171,7 +166,37 @@ class ZoomLevelObserver : public NotificationObserver {
 }
 
 - (WrenchMenuModel*)wrenchMenuModel {
-  return wrench_model_;
+  return static_cast<WrenchMenuModel*>(model_);
+}
+
+// Inserts the update available notification menu item.
+- (void)insertUpdateAvailableItem {
+  WrenchMenuModel* model = [self wrenchMenuModel];
+  // Don't insert the item multiple times.
+  if (!model || model->GetIndexOfCommandId(IDC_ABOUT) != -1)
+    return;
+
+  // Update the model manually because the model is static because other
+  // platforms always have an About item.
+  int index = model->GetIndexOfCommandId(IDC_OPTIONS) + 1;
+  model->InsertItemAt(index, IDC_ABOUT,
+                      l10n_util::GetStringFUTF16(IDS_ABOUT,
+                          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+
+  // The model does not broadcast change notifications to its delegate, so
+  // insert the actual menu item ourselves.
+  NSInteger menuIndex = [[self menu] indexOfItemWithTag:index];
+  [self addItemToMenu:[self menu]
+              atIndex:menuIndex
+            fromModel:model
+           modelIndex:index];
+
+  // Since the tag of each menu item is the index within the model, they need
+  // to be adjusted after insertion.
+  for (NSInteger i = menuIndex + 1; i < [[self menu] numberOfItems]; ++i) {
+    NSMenuItem* item = [[self menu] itemAtIndex:i];
+    [item setTag:[item tag] + 1];
+  }
 }
 
 // Fit the localized strings into the Cut/Copy/Paste control, then resize the
diff --git a/chrome/browser/cocoa/wrench_menu_controller_unittest.mm b/chrome/browser/cocoa/wrench_menu_controller_unittest.mm
index d617afb..446bd80 100644
--- a/chrome/browser/cocoa/wrench_menu_controller_unittest.mm
+++ b/chrome/browser/cocoa/wrench_menu_controller_unittest.mm
@@ -76,7 +76,7 @@ TEST_F(WrenchMenuControllerTest, DispatchSimple) {
 
   // Set fake model to test dispatching.
   EXPECT_CALL(fake_model_, ExecuteCommand(IDC_ZOOM_PLUS));
-  [controller() setWrenchMenuModel:&fake_model_];
+  [controller() setModel:&fake_model_];
 
   [controller() dispatchWrenchMenuCommand:button.get()];
 }
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index 2d8562a..a28abed 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -227,7 +227,7 @@ void BrowserToolbarGtk::Init(Profile* profile,
   gtk_container_add(GTK_CONTAINER(wrench_box), wrench_button);
   gtk_box_pack_start(GTK_BOX(toolbar_), wrench_box, FALSE, FALSE, 4);
 
-  wrench_menu_.reset(new MenuGtk(this, wrench_menu_model_.menu_model()));
+  wrench_menu_.reset(new MenuGtk(this, &wrench_menu_model_));
   g_signal_connect(wrench_menu_->widget(), "show",
                    G_CALLBACK(OnWrenchMenuShowThunk), this);
 
@@ -333,7 +333,33 @@ GtkIconSet* BrowserToolbarGtk::GetIconSetForId(int idr) {
   return theme_provider_->GetIconSetForId(idr);
 }
 
-// menus::AcceleratorProvider
+// menus::SimpleMenuModel::Delegate
+
+bool BrowserToolbarGtk::IsCommandIdEnabled(int id) const {
+  return browser_->command_updater()->IsCommandEnabled(id);
+}
+
+bool BrowserToolbarGtk::IsCommandIdChecked(int id) const {
+  if (!profile_)
+    return false;
+
+  EncodingMenuController controller;
+  if (id == IDC_SHOW_BOOKMARK_BAR) {
+    return profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
+  } else if (controller.DoesCommandBelongToEncodingMenu(id)) {
+    TabContents* tab_contents = browser_->GetSelectedTabContents();
+    if (tab_contents) {
+      return controller.IsItemChecked(profile_, tab_contents->encoding(),
+                                      id);
+    }
+  }
+
+  return false;
+}
+
+void BrowserToolbarGtk::ExecuteCommand(int id) {
+  browser_->ExecuteCommand(id);
+}
 
 bool BrowserToolbarGtk::GetAcceleratorForCommandId(
     int id,
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h
index 1018dc0..09f04f1 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.h
+++ b/chrome/browser/gtk/browser_toolbar_gtk.h
@@ -12,7 +12,6 @@
 #include "app/active_window_watcher_x.h"
 #include "app/gtk_signal.h"
 #include "app/gtk_signal_registrar.h"
-#include "app/menus/accelerator.h"
 #include "app/menus/simple_menu_model.h"
 #include "app/throb_animation.h"
 #include "base/scoped_ptr.h"
@@ -41,7 +40,7 @@ class ToolbarModel;
 // View class that displays the GTK version of the toolbar and routes gtk
 // events back to the Browser.
 class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
-                          public menus::AcceleratorProvider,
+                          public menus::SimpleMenuModel::Delegate,
                           public MenuGtk::Delegate,
                           public NotificationObserver,
                           public AnimationDelegate,
@@ -95,7 +94,10 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
   virtual void StoppedShowing();
   virtual GtkIconSet* GetIconSetForId(int idr);
 
-  // Overridden from menus::AcceleratorProvider:
+  // Overridden from menus::SimpleMenuModel::Delegate:
+  virtual bool IsCommandIdEnabled(int id) const;
+  virtual bool IsCommandIdChecked(int id) const;
+  virtual void ExecuteCommand(int id);
   virtual bool GetAcceleratorForCommandId(int id,
                                           menus::Accelerator* accelerator);
 
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 252621f..26f0768 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -110,7 +110,7 @@ void ToolbarView::Init(Profile* profile) {
       browser_, BackForwardMenuModel::BACKWARD_MENU));
   forward_menu_model_.reset(new BackForwardMenuModel(
       browser_, BackForwardMenuModel::FORWARD_MENU));
-  wrench_menu_model_.reset(new WrenchMenuModel(this, browser_));
+  app_menu_model_.reset(new WrenchMenuModel(this, browser_));
 
   back_ = new views::ButtonDropDown(this, back_menu_model_.get());
   back_->set_triggerable_event_flags(views::Event::EF_LEFT_BUTTON_DOWN |
@@ -248,7 +248,7 @@ void ToolbarView::RunMenu(views::View* source, const gfx::Point& /*pt*/) {
   bool destroyed_flag = false;
   destroyed_flag_ = &destroyed_flag;
   wrench_menu_.reset(new WrenchMenu(browser_));
-  wrench_menu_->Init(wrench_menu_model_->menu_model());
+  wrench_menu_->Init(app_menu_model_.get());
 
   for (size_t i = 0; i < menu_listeners_.size(); ++i)
     menu_listeners_[i]->OnMenuOpened();
@@ -344,7 +344,21 @@ void ToolbarView::Observe(NotificationType type,
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ToolbarView, menus::AcceleratorProvider implementation:
+// ToolbarView, menus::SimpleMenuModel::Delegate implementation:
+
+bool ToolbarView::IsCommandIdChecked(int command_id) const {
+#if defined(OS_CHROMEOS)
+  if (command_id == IDC_TOGGLE_VERTICAL_TABS) {
+    return browser_->UseVerticalTabs();
+  }
+#endif
+  return (command_id == IDC_SHOW_BOOKMARK_BAR) &&
+      profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
+}
+
+bool ToolbarView::IsCommandIdEnabled(int command_id) const {
+  return browser_->command_updater()->IsCommandEnabled(command_id);
+}
 
 bool ToolbarView::GetAcceleratorForCommandId(int command_id,
     menus::Accelerator* accelerator) {
@@ -366,6 +380,10 @@ bool ToolbarView::GetAcceleratorForCommandId(int command_id,
   return GetWidget()->GetAccelerator(command_id, accelerator);
 }
 
+void ToolbarView::ExecuteCommand(int command_id) {
+  browser_->ExecuteCommand(command_id);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::View overrides:
 
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index 08550c071..af73d60 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include "app/menus/accelerator.h"
+#include "app/menus/simple_menu_model.h"
 #include "app/slide_animation.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/back_forward_menu_model.h"
@@ -27,12 +27,11 @@ class BrowserActionsContainer;
 class Browser;
 class Profile;
 class WrenchMenu;
-class WrenchMenuModel;
 
 // The Browser Window's toolbar.
 class ToolbarView : public AccessibleToolbarView,
                     public views::ViewMenuDelegate,
-                    public menus::AcceleratorProvider,
+                    public menus::SimpleMenuModel::Delegate,
                     public LocationBarView::Delegate,
                     public AnimationDelegate,
                     public NotificationObserver,
@@ -105,9 +104,12 @@ class ToolbarView : public AccessibleToolbarView,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // Overridden from menus::AcceleratorProvider:
+  // Overridden from menus::SimpleMenuModel::Delegate:
+  virtual bool IsCommandIdChecked(int command_id) const;
+  virtual bool IsCommandIdEnabled(int command_id) const;
   virtual bool GetAcceleratorForCommandId(int command_id,
                                           menus::Accelerator* accelerator);
+  virtual void ExecuteCommand(int command_id);
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize();
@@ -183,7 +185,7 @@ class ToolbarView : public AccessibleToolbarView,
   DisplayMode display_mode_;
 
   // The contents of the app menu.
-  scoped_ptr<WrenchMenuModel> wrench_menu_model_;
+  scoped_ptr<menus::SimpleMenuModel> app_menu_model_;
 
   // Wrench menu.
   scoped_ptr<WrenchMenu> wrench_menu_;
diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc
index b1d39d1..031d0d9 100644
--- a/chrome/browser/wrench_menu_model.cc
+++ b/chrome/browser/wrench_menu_model.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/encoding_menu_controller.h"
 #include "chrome/browser/host_zoom_map.h"
-#include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
@@ -30,7 +29,6 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
-#include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -39,10 +37,6 @@
 #include <gtk/gtk.h>
 #endif
 
-#if defined(OS_MACOSX)
-#include "chrome/browser/browser_window.h"
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 // EncodingMenuModel
 
@@ -169,10 +163,10 @@ void ToolsMenuModel::Build(Browser* browser) {
 ////////////////////////////////////////////////////////////////////////////////
 // WrenchMenuModel
 
-WrenchMenuModel::WrenchMenuModel(menus::AcceleratorProvider* provider,
+WrenchMenuModel::WrenchMenuModel(menus::SimpleMenuModel::Delegate* delegate,
                                  Browser* browser)
-    : ALLOW_THIS_IN_INITIALIZER_LIST(model_(this)),
-      provider_(provider),
+    : menus::SimpleMenuModel(delegate),
+      delegate_(delegate),
       browser_(browser),
       tabstrip_model_(browser_->tabstrip_model()) {
   Build();
@@ -191,64 +185,50 @@ WrenchMenuModel::~WrenchMenuModel() {
     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;
+bool WrenchMenuModel::IsLabelDynamicAt(int index) const {
+  return IsDynamicItem(index) || SimpleMenuModel::IsLabelDynamicAt(index);
 }
 
-string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
+string16 WrenchMenuModel::GetLabelAt(int index) const {
+  if (!IsDynamicItem(index))
+    return SimpleMenuModel::GetLabelAt(index);
+
+  int command_id = GetCommandIdAt(index);
+
   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;
-      return l10n_util::GetStringUTF16(string_id);
-    }
-#endif
     default:
       NOTREACHED();
       return string16();
   }
 }
 
-void WrenchMenuModel::ExecuteCommand(int command_id) {
-  browser_->ExecuteCommand(command_id);
-}
-
-bool WrenchMenuModel::IsCommandIdChecked(int command_id) const {
-#if defined(OS_CHROMEOS)
-  if (command_id == IDC_TOGGLE_VERTICAL_TABS) {
-    return browser_->UseVerticalTabs();
-  }
-#endif
-
-  if (command_id == IDC_SHOW_BOOKMARK_BAR) {
-    return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
+bool WrenchMenuModel::GetIconAt(int index, SkBitmap* icon) const {
+  if (GetCommandIdAt(index) == IDC_ABOUT &&
+      Singleton<UpgradeDetector>::get()->notify_upgrade()) {
+    // Show the exclamation point next to the menu item.
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    *icon = *rb.GetBitmapNamed(IDR_UPDATE_AVAILABLE);
+    return true;
   }
-
   return false;
 }
 
-bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const {
-  return browser_->command_updater()->IsCommandEnabled(command_id);
+bool WrenchMenuModel::IsLabelForCommandIdDynamic(int command_id) const {
+  return command_id == IDC_ZOOM_PERCENT_DISPLAY;
+}
+
+string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
+  DCHECK_EQ(IDC_ZOOM_PERCENT_DISPLAY, command_id);
+  return zoom_label_;
 }
 
-bool WrenchMenuModel::GetAcceleratorForCommandId(
-      int command_id,
-      menus::Accelerator* accelerator) {
-  return provider_->GetAcceleratorForCommandId(command_id, accelerator);
+void WrenchMenuModel::ExecuteCommand(int command_id) {
+  if (delegate_)
+    delegate_->ExecuteCommand(command_id);
 }
 
 void WrenchMenuModel::TabSelectedAt(TabContents* old_contents,
@@ -278,17 +258,12 @@ void WrenchMenuModel::Observe(NotificationType type,
   UpdateZoomControls();
 }
 
-// For testing.
-WrenchMenuModel::WrenchMenuModel() : model_(NULL) {
-}
-
 void WrenchMenuModel::Build() {
-  model_.AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
-  model_.AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
-  model_.AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW,
-                             IDS_NEW_INCOGNITO_WINDOW);
+  AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
+  AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
+  AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
 
-  model_.AddSeparator();
+  AddSeparator();
 #if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
   // WARNING: Mac does not use the ButtonMenuItemModel, but instead defines the
   // layout for this menu item in Toolbar.xib. It does, however, use the
@@ -297,13 +272,13 @@ void WrenchMenuModel::Build() {
   edit_menu_item_model_->AddGroupItemWithStringId(IDC_CUT, IDS_CUT);
   edit_menu_item_model_->AddGroupItemWithStringId(IDC_COPY, IDS_COPY);
   edit_menu_item_model_->AddGroupItemWithStringId(IDC_PASTE, IDS_PASTE);
-  model_.AddButtonItem(IDC_EDIT_MENU, edit_menu_item_model_.get());
+  AddButtonItem(IDC_EDIT_MENU, edit_menu_item_model_.get());
 #else
   // TODO(port): Move to the above.
   CreateCutCopyPaste();
 #endif
 
-  model_.AddSeparator();
+  AddSeparator();
 #if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
   // WARNING: See above comment.
   zoom_menu_item_model_.reset(
@@ -317,79 +292,68 @@ void WrenchMenuModel::Build() {
   zoom_menu_item_model_->AddSpace();
   zoom_menu_item_model_->AddItemWithImage(
       IDC_FULLSCREEN, IDR_FULLSCREEN_MENU_BUTTON);
-  model_.AddButtonItem(IDC_ZOOM_MENU, zoom_menu_item_model_.get());
+  AddButtonItem(IDC_ZOOM_MENU, zoom_menu_item_model_.get());
 #else
   // TODO(port): Move to the above.
   CreateZoomFullscreen();
 #endif
 
-  model_.AddSeparator();
-  model_.AddItemWithStringId(IDC_SAVE_PAGE, IDS_SAVE_PAGE);
-  model_.AddItemWithStringId(IDC_FIND, IDS_FIND);
-  model_.AddItemWithStringId(IDC_PRINT, IDS_PRINT);
+  AddSeparator();
+  AddItemWithStringId(IDC_SAVE_PAGE, IDS_SAVE_PAGE);
+  AddItemWithStringId(IDC_FIND, IDS_FIND);
+  AddItemWithStringId(IDC_PRINT, IDS_PRINT);
 
-  tools_menu_model_.reset(new ToolsMenuModel(this, browser_));
-  model_.AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_TOOLS_MENU,
+  tools_menu_model_.reset(new ToolsMenuModel(delegate(), browser_));
+  AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_TOOLS_MENU,
                          tools_menu_model_.get());
 
-  model_.AddSeparator();
+  AddSeparator();
 #if defined(ENABLE_REMOTING)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) {
-    model_.AddItem(IDC_REMOTING_SETUP,
+    AddItem(IDC_REMOTING_SETUP,
             l10n_util::GetStringUTF16(IDS_REMOTING_SETUP_LABEL));
   }
 #endif
-  model_.AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
-  model_.AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
-  model_.AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
-  model_.AddSeparator();
+  AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER);
+  AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
+  AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
+  AddSeparator();
 
 #if defined(OS_MACOSX)
-  model_.AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES_MAC);
+  AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES_MAC);
 #elif defined(OS_LINUX)
   GtkStockItem stock_item;
   if (gtk_stock_lookup(GTK_STOCK_PREFERENCES, &stock_item)) {
     const char16 kUnderscore[] = { '_', 0 };
     string16 preferences;
     RemoveChars(UTF8ToUTF16(stock_item.label), kUnderscore, &preferences);
-    model_.AddItem(IDC_OPTIONS, preferences);
-  } else {
-    model_.AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
+    AddItem(IDC_OPTIONS, preferences);
   }
 #else
-  model_.AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
+  AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
 #endif
 
 #if defined(OS_CHROMEOS)
-  model_.AddCheckItemWithStringId(IDC_TOGGLE_VERTICAL_TABS,
+  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 unless it is replaced with the update
   // available notification.
   if (browser_defaults::kShowAboutMenuItem ||
       Singleton<UpgradeDetector>::get()->notify_upgrade()) {
-    model_.AddItem(IDC_ABOUT,
+    AddItem(IDC_ABOUT,
             l10n_util::GetStringFUTF16(
                 IDS_ABOUT,
                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
-    // ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    // model_.SetIcon(model_.GetIndexOfCommandId(IDC_ABOUT),
-    //                *rb.GetBitmapNamed(IDR_UPDATE_AVAILABLE));
   }
-  model_.AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
+  AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   if (browser_defaults::kShowExitMenuItem) {
-    model_.AddSeparator();
+    AddSeparator();
 #if defined(OS_CHROMEOS)
-    model_.AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
+    AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
 #else
-    model_.AddItemWithStringId(IDC_EXIT, IDS_EXIT);
+    AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 #endif
   }
 }
@@ -397,17 +361,17 @@ void WrenchMenuModel::Build() {
 void WrenchMenuModel::CreateCutCopyPaste() {
   // WARNING: views/wrench_menu assumes these items are added in this order. If
   // you change the order you'll need to update wrench_menu as well.
-  model_.AddItemWithStringId(IDC_CUT, IDS_CUT);
-  model_.AddItemWithStringId(IDC_COPY, IDS_COPY);
-  model_.AddItemWithStringId(IDC_PASTE, IDS_PASTE);
+  AddItemWithStringId(IDC_CUT, IDS_CUT);
+  AddItemWithStringId(IDC_COPY, IDS_COPY);
+  AddItemWithStringId(IDC_PASTE, IDS_PASTE);
 }
 
 void WrenchMenuModel::CreateZoomFullscreen() {
   // WARNING: views/wrench_menu assumes these items are added in this order. If
   // you change the order you'll need to update wrench_menu as well.
-  model_.AddItemWithStringId(IDC_ZOOM_MINUS, IDS_ZOOM_MINUS);
-  model_.AddItemWithStringId(IDC_ZOOM_PLUS, IDS_ZOOM_PLUS);
-  model_.AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN);
+  AddItemWithStringId(IDC_ZOOM_MINUS, IDS_ZOOM_MINUS);
+  AddItemWithStringId(IDC_ZOOM_PLUS, IDS_ZOOM_PLUS);
+  AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN);
 }
 
 void WrenchMenuModel::UpdateZoomControls() {
@@ -451,3 +415,15 @@ string16 WrenchMenuModel::GetAboutEntryMenuLabel() const {
   return l10n_util::GetStringFUTF16(
       IDS_ABOUT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 }
+
+bool WrenchMenuModel::IsDynamicItem(int index) const {
+  int command_id = GetCommandIdAt(index);
+  return command_id == IDC_SYNC_BOOKMARKS ||
+         command_id == IDC_ABOUT;
+}
+
+bool WrenchMenuModel::IsCommandIdEnabled(int command_id) const {
+  if (delegate_)
+    return delegate_->IsCommandIdEnabled(command_id);
+  return true;
+}
diff --git a/chrome/browser/wrench_menu_model.h b/chrome/browser/wrench_menu_model.h
index ba45a03..3bf6c24 100644
--- a/chrome/browser/wrench_menu_model.h
+++ b/chrome/browser/wrench_menu_model.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_WRENCH_MENU_MODEL_H_
 #pragma once
 
-#include "app/menus/accelerator.h"
 #include "app/menus/button_menu_item_model.h"
 #include "app/menus/simple_menu_model.h"
 #include "base/scoped_ptr.h"
@@ -68,23 +67,26 @@ class ToolsMenuModel : public menus::SimpleMenuModel {
 };
 
 // A menu model that builds the contents of the wrench menu.
-class WrenchMenuModel : public menus::SimpleMenuModel::Delegate,
+class WrenchMenuModel : public menus::SimpleMenuModel,
                         public menus::ButtonMenuItemModel::Delegate,
                         public TabStripModelObserver,
                         public NotificationObserver {
  public:
-  WrenchMenuModel(menus::AcceleratorProvider* provider, Browser* browser);
+  WrenchMenuModel(menus::SimpleMenuModel::Delegate* delegate,
+                  Browser* browser);
   virtual ~WrenchMenuModel();
 
-  // Overridden for both ButtonMenuItemModel::Delegate and SimpleMenuModel:
+  // Overridden from menus::SimpleMenuModel:
+  virtual bool IsLabelDynamicAt(int index) const;
+  virtual string16 GetLabelAt(int index) const;
+  virtual bool HasIcons() const { return true; }
+  virtual bool GetIconAt(int index, SkBitmap* icon) const;
+
+  // Overridden from menus::ButtonMenuItemModel::Delegate:
   virtual bool IsLabelForCommandIdDynamic(int command_id) const;
   virtual string16 GetLabelForCommandId(int command_id) const;
   virtual void ExecuteCommand(int command_id);
-  virtual bool IsCommandIdChecked(int command_id) const;
   virtual bool IsCommandIdEnabled(int command_id) const;
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      menus::Accelerator* accelerator);
 
   // Overridden from TabStripModelObserver:
   virtual void TabSelectedAt(TabContents* old_contents,
@@ -102,7 +104,6 @@ class WrenchMenuModel : public menus::SimpleMenuModel::Delegate,
 
   // Getters.
   Browser* browser() const { return browser_; }
-  menus::SimpleMenuModel* menu_model() { return &model_; }
 
   // Calculates |zoom_label_| in response to a zoom change.
   void UpdateZoomControls();
@@ -110,7 +111,7 @@ class WrenchMenuModel : public menus::SimpleMenuModel::Delegate,
  private:
   // Testing constructor used for mocking.
   friend class ::MockWrenchMenuModel;
-  WrenchMenuModel();
+  WrenchMenuModel() : menus::SimpleMenuModel(NULL) {}
 
   void Build();
 
@@ -124,9 +125,7 @@ class WrenchMenuModel : public menus::SimpleMenuModel::Delegate,
 
   string16 GetSyncMenuLabel() const;
   string16 GetAboutEntryMenuLabel() const;
-
-  // Our menu, for which we are the delegate.
-  menus::SimpleMenuModel model_;
+  bool IsDynamicItem(int index) const;
 
   // Models for the special menu items with buttons.
   scoped_ptr<menus::ButtonMenuItemModel> edit_menu_item_model_;
@@ -138,7 +137,7 @@ class WrenchMenuModel : public menus::SimpleMenuModel::Delegate,
   // Tools menu.
   scoped_ptr<ToolsMenuModel> tools_menu_model_;
 
-  menus::AcceleratorProvider* provider_;
+  menus::SimpleMenuModel::Delegate* delegate_; // weak
 
   Browser* browser_;  // weak
   TabStripModel* tabstrip_model_; // weak
diff --git a/chrome/browser/wrench_menu_model_unittest.cc b/chrome/browser/wrench_menu_model_unittest.cc
index d38147e..2b50bb0 100644
--- a/chrome/browser/wrench_menu_model_unittest.cc
+++ b/chrome/browser/wrench_menu_model_unittest.cc
@@ -12,51 +12,12 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 class WrenchMenuModelTest : public BrowserWithTestWindowTest,
-                            public menus::AcceleratorProvider {
- public:
-  // Don't handle accelerators.
-  virtual bool GetAcceleratorForCommandId(
-      int command_id,
-      menus::Accelerator* accelerator) { return false; }
-};
-
-// Copies parts of MenuModelTest::Delegate and combines them with the
-// WrenchMenuModel since WrenchMenuModel is now a SimpleMenuModel::Delegate and
-// not derived from SimpleMenuModel.
-class TestWrenchMenuModel : public WrenchMenuModel {
- public:
-  TestWrenchMenuModel(menus::AcceleratorProvider* provider,
-                      Browser* browser)
-      : WrenchMenuModel(provider, browser),
-        execute_count_(0),
-        checked_count_(0),
-        enable_count_(0) {
-  }
-
-  // Testing overrides to menus::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const {
-    bool val = WrenchMenuModel::IsCommandIdChecked(command_id);
-    if (val)
-      checked_count_++;
-    return val;
-  }
-
-  virtual bool IsCommandIdEnabled(int command_id) const {
-    ++enable_count_;
-    return true;
-  }
-
-  virtual void ExecuteCommand(int command_id) { ++execute_count_; }
-
-  int execute_count_;
-  mutable int checked_count_;
-  mutable int enable_count_;
+                            public MenuModelTest {
 };
 
 TEST_F(WrenchMenuModelTest, Basics) {
-  TestWrenchMenuModel wrench(this, browser());
-  menus::SimpleMenuModel* model = wrench.menu_model();
-  int itemCount = model->GetItemCount();
+  WrenchMenuModel model(&delegate_, browser());
+  int itemCount = model.GetItemCount();
 
   // Verify it has items. The number varies by platform, so we don't check
   // the exact number.
@@ -65,34 +26,34 @@ TEST_F(WrenchMenuModelTest, Basics) {
   // Execute a couple of the items and make sure it gets back to our delegate.
   // We can't use CountEnabledExecutable() here because the encoding menu's
   // delegate is internal, it doesn't use the one we pass in.
-  model->ActivatedAt(0);
-  EXPECT_TRUE(model->IsEnabledAt(0));
+  model.ActivatedAt(0);
+  EXPECT_TRUE(model.IsEnabledAt(0));
   // Make sure to use the index that is not separator in all configurations.
-  model->ActivatedAt(2);
-  EXPECT_TRUE(model->IsEnabledAt(2));
-  EXPECT_EQ(wrench.execute_count_, 2);
-  EXPECT_EQ(wrench.enable_count_, 2);
+  model.ActivatedAt(2);
+  EXPECT_TRUE(model.IsEnabledAt(2));
+  EXPECT_EQ(delegate_.execute_count_, 2);
+  EXPECT_EQ(delegate_.enable_count_, 2);
 
-  wrench.execute_count_ = 0;
-  wrench.enable_count_ = 0;
+  delegate_.execute_count_ = 0;
+  delegate_.enable_count_ = 0;
 
   // Choose something from the tools submenu and make sure it makes it back to
   // the delegate as well. Use the first submenu as the tools one.
   int toolsModelIndex = -1;
   for (int i = 0; i < itemCount; ++i) {
-    if (model->GetTypeAt(i) == menus::MenuModel::TYPE_SUBMENU) {
+    if (model.GetTypeAt(i) == menus::MenuModel::TYPE_SUBMENU) {
       toolsModelIndex = i;
       break;
     }
   }
   EXPECT_GT(toolsModelIndex, -1);
-  menus::MenuModel* toolsModel = model->GetSubmenuModelAt(toolsModelIndex);
+  menus::MenuModel* toolsModel = model.GetSubmenuModelAt(toolsModelIndex);
   EXPECT_TRUE(toolsModel);
   EXPECT_GT(toolsModel->GetItemCount(), 2);
   toolsModel->ActivatedAt(2);
   EXPECT_TRUE(toolsModel->IsEnabledAt(2));
-  EXPECT_EQ(wrench.execute_count_, 1);
-  EXPECT_EQ(wrench.enable_count_, 1);
+  EXPECT_EQ(delegate_.execute_count_, 1);
+  EXPECT_EQ(delegate_.enable_count_, 1);
 }
 
 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
diff --git a/chrome/test/menu_model_test.h b/chrome/test/menu_model_test.h
index 92c390c..a87993b4 100644
--- a/chrome/test/menu_model_test.h
+++ b/chrome/test/menu_model_test.h
@@ -6,7 +6,6 @@
 #define CHROME_TEST_MENU_MODEL_TEST_H_
 #pragma once
 
-#include "app/menus/accelerator.h"
 #include "app/menus/simple_menu_model.h"
 
 // A mix-in class to be used in addition to something that derrives from
@@ -19,8 +18,7 @@ class MenuModelTest {
  protected:
   // A menu delegate that counts the number of times certain things are called
   // to make sure things are hooked up properly.
-  class Delegate : public menus::SimpleMenuModel::Delegate,
-                   public menus::AcceleratorProvider {
+  class Delegate : public menus::SimpleMenuModel::Delegate {
    public:
     Delegate() : execute_count_(0), enable_count_(0) { }