Clean up the WrenchMenuModel so that it uses SimpleMenu::Delegate.

chrome/browser/gtk/browser_toolbar_gtk.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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 209 matching lines @@
   GTK_WIDGET_UNSET_FLAGS(wrench_button, GTK_CAN_FOCUS);
 
   // Put the wrench button in a box so that we can paint the update notification
   // over it.
   GtkWidget* wrench_box = gtk_alignment_new(0, 0, 1, 1);
   g_signal_connect_after(wrench_box, "expose-event",
                          G_CALLBACK(OnWrenchMenuButtonExposeThunk), this);
   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_));
+  wrench_menu_.reset(new MenuGtk(this, wrench_menu_model_.menu_model()));
   g_signal_connect(wrench_menu_->widget(), "show",
                    G_CALLBACK(OnWrenchMenuShowThunk), this);
 
   if (ShouldOnlyShowLocation()) {
     gtk_widget_show(event_box_);
     gtk_widget_show(alignment_);
     gtk_widget_show(toolbar_);
     gtk_widget_show_all(location_hbox_);
     gtk_widget_hide(reload_->widget());
   } else {
@@ skipping 85 matching lines @@
   // event is not sent when clicking a button brings up the menu.
   gtk_chrome_button_set_hover_state(
       GTK_CHROME_BUTTON(wrench_menu_button_->widget()), 0.0);
   wrench_menu_button_->UnsetPaintOverride();
 }
 
 GtkIconSet* BrowserToolbarGtk::GetIconSetForId(int idr) {
   return theme_provider_->GetIconSetForId(idr);
 }
 
-// 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);
-}
+// menus::AcceleratorProvider
 
 bool BrowserToolbarGtk::GetAcceleratorForCommandId(
     int id,
     menus::Accelerator* accelerator) {
   const menus::AcceleratorGtk* accelerator_gtk =
       Singleton<AcceleratorsGtk>()->GetPrimaryAcceleratorForCommand(id);
   if (accelerator_gtk)
     *accelerator = *accelerator_gtk;
   return !!accelerator_gtk;
 }
@@ skipping 340 matching lines @@
 
   return FALSE;
 }
 
 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() {
   return upgrade_reminder_animation_.cycles_remaining() > 0 &&
       // This funky looking math makes the badge throb for 2 seconds once
       // every 8 seconds.
       ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0;
 }