GTK: Switch the page/app menus over to the new menu bar helper class....

chrome/browser/gtk/browser_toolbar_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
 #define CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
 
 #include <gtk/gtk.h>
 #include <string>
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/command_updater.h"
+#include "chrome/browser/gtk/menu_bar_helper.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/pref_member.h"
 
 class BackForwardButtonGtk;
 class Browser;
 class BrowserWindowGtk;
 class CustomDrawButton;
 class GtkThemeProvider;
 class GoButtonGtk;
 class LocationBar;
 class LocationBarViewGtk;
 class Profile;
 class TabContents;
 class ToolbarModel;
 class ToolbarStarToggleGtk;
 
 // View class that displays the GTK version of the toolbar and routes gtk
 // events back to the Browser.
 class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
                           public MenuGtk::Delegate,
                           public NotificationObserver,
-                          public AutocompletePopupPositioner {
+                          public AutocompletePopupPositioner,
+                          public MenuBarHelper::Delegate {
  public:
   explicit BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window);
   virtual ~BrowserToolbarGtk();
 
   // Create the contents of the toolbar. |top_level_window| is the GtkWindow
   // to which we attach our accelerators.
   void Init(Profile* profile, GtkWindow* top_level_window);
 
   // Set the various widgets' ViewIDs.
   void SetViewIDs();
@@ skipping 34 matching lines @@
 
   // Message that we should react to a state change.
   void UpdateTabContents(TabContents* contents, bool should_restore_state);
 
   ToolbarStarToggleGtk* star() { return star_.get(); }
 
   // Implement AutocompletePopupPositioner, return the position of where the
   // Omnibox results popup should go (from the star to the go buttons).
   virtual gfx::Rect GetPopupBounds() const;
 
+  // MenuBarHelper::Delegate implementation ------------------------------------
+  virtual void PopupForButton(GtkWidget* button);
+  virtual void PopupForButtonNextTo(GtkWidget* button,
+                                    GtkMenuDirectionType dir);
+
  private:
   // Builds a toolbar button with all the properties set.
   // |spacing| is the width of padding (in pixels) on the left and right of the
   // button.
   CustomDrawButton* BuildToolbarButton(int normal_id,
                                        int active_id,
                                        int highlight_id,
                                        int depressed_id,
                                        const std::string& localized_tooltip,
                                        const char* stock_id);
@@ skipping 34 matching lines @@
                                 BrowserToolbarGtk* toolbar);
 
   // Used for drags onto home button.
   static void OnDragDataReceived(GtkWidget* widget,
                                  GdkDragContext* drag_context,
                                  gint x, gint y,
                                  GtkSelectionData* data,
                                  guint info, guint time,
                                  BrowserToolbarGtk* toolbar);
 
-  // These event handlers are used to fake menu-bar behavior in the page and
-  // app menus.
-  static gboolean OnPageAppMenuMouseMotion(GtkWidget* widget,
-                                           GdkEventMotion* event,
-                                           BrowserToolbarGtk* toolbar);
-  static void OnPageAppMenuMoveCurrent(GtkWidget* widget,
-                                       GtkMenuDirectionType dir,
-                                       BrowserToolbarGtk* toolbar);
-
   // Sometimes we only want to show the location w/o the toolbar buttons (e.g.,
   // in a popup window).
   bool ShouldOnlyShowLocation() const;
 
   // An event box that holds |toolbar_|. We need the toolbar to have its own
   // GdkWindow when we use the GTK drawing because otherwise the color from our
   // parent GdkWindow will leak through with some theme engines (such as
   // Clearlooks).
   GtkWidget* event_box_;
 
@@ skipping 35 matching lines @@
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   NotificationRegistrar registrar_;
 
   // A GtkEntry that isn't part of the hierarchy. We keep this for native
   // rendering.
   OwnedWidgetGtk offscreen_entry_;
 
+  MenuBarHelper menu_bar_helper_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_