Make back forward menu model a MenuModel....

chrome/browser/gtk/back_forward_button_gtk.cc

 // Copyright (c) 2009 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/back_forward_button_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
+#include "app/menus/menu_model.h"
 #include "base/message_loop.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/back_forward_menu_model.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/gtk/back_forward_menu_model_gtk.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 // The time in milliseconds between when the user clicks and the menu appears.
 static const int kMenuTimerDelay = 500;
 
@@ skipping 19 matching lines @@
     background = IDR_BACK_MASK;
     tooltip = IDS_TOOLTIP_BACK;
     stock = GTK_STOCK_GO_BACK;
   }
   button_.reset(new CustomDrawButton(
       GtkThemeProvider::GetFrom(browser_->profile()),
       normal, active, highlight, depressed, background, stock,
       GTK_ICON_SIZE_SMALL_TOOLBAR));
   gtk_widget_set_tooltip_text(widget(),
                               l10n_util::GetStringUTF8(tooltip).c_str());
-  menu_model_.reset(new BackForwardMenuModelGtk(browser,
-      is_forward ?
-          BackForwardMenuModel::FORWARD_MENU :
-          BackForwardMenuModel::BACKWARD_MENU,
-      this));
+  menu_model_.reset(
+      new BackForwardMenuModel(browser,
+          is_forward ?
+              BackForwardMenuModel::FORWARD_MENU :
+              BackForwardMenuModel::BACKWARD_MENU));
 
   g_signal_connect(widget(), "clicked",
                    G_CALLBACK(OnClick), this);
   g_signal_connect(widget(), "button-press-event",
                    G_CALLBACK(OnButtonPress), this);
   gtk_widget_add_events(widget(), GDK_POINTER_MOTION_MASK);
   g_signal_connect(widget(), "motion-notify-event",
                    G_CALLBACK(OnMouseMove), this);
 
   // Popup the menu as left-aligned relative to this widget rather than the
   // default of right aligned.
   g_object_set_data(G_OBJECT(widget()), "left-align-popup",
                     reinterpret_cast<void*>(true));
 
   gtk_util::SetButtonTriggersNavigation(widget());
 }
 
 BackForwardButtonGtk::~BackForwardButtonGtk() {
 }
 
-void BackForwardButtonGtk::StoppedShowingMenu() {
+void BackForwardButtonGtk::StoppedShowing() {
   button_->UnsetPaintOverride();
 }
 
+bool BackForwardButtonGtk::IsCommandEnabled(int command_id) const {
+  return menu_model_->IsEnabledAt(command_id);
+}
+
+void BackForwardButtonGtk::ExecuteCommand(int command_id) {
+  menu_model_->ActivatedAt(command_id);
+}
+
+bool BackForwardButtonGtk::AlwaysShowImages() const {
+  return true;
+}
+
 void BackForwardButtonGtk::ShowBackForwardMenu() {
-  menu_.reset(new MenuGtk(menu_model_.get(), true));
+  menu_.reset(new MenuGtk(this, menu_model_.get()));
   button_->SetPaintOverride(GTK_STATE_ACTIVE);
 
   // gtk_menu_popup will ignore the first mouse button release if it matches
   // the button type and is within a short span of the time we pass here.
   // Since this menu is not popped up by a button press (instead, it is popped
   // up either on a timer or on a drag) this doesn't apply to us and we can
   // pass arbitrary values.
   menu_->Popup(widget(), 1, gtk_get_current_event_time());
 }
 
@@ skipping 38 matching lines @@
   int drag_min_distance;
   g_object_get(settings, "gtk-dnd-drag-threshold", &drag_min_distance, NULL);
   if (event->y - button->y_position_of_last_press_ < drag_min_distance)
     return FALSE;
 
   // We will show the menu now. Cancel the delayed event.
   button->show_menu_factory_.RevokeAll();
   button->ShowBackForwardMenu();
   return FALSE;
 }
+