Merge 37725 - GTK: Make page and app menus shortcut control flow match window...

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>
 
@@ skipping 67 matching lines @@
   BrowserActionsToolbarGtk* GetBrowserActionsToolbar() {
     return actions_toolbar_.get();
   }
 
   LocationBarViewGtk* GetLocationBarView() { return location_bar_.get(); }
 
   // We have to show padding on the bottom of the toolbar when the bookmark
   // is in floating mode. Otherwise the bookmark bar will paint it for us.
   void UpdateForBookmarkBarVisibility(bool show_bottom_padding);
 
+  void ShowPageMenu();
+  void ShowAppMenu();
+
   // Overridden from CommandUpdater::CommandObserver:
   virtual void EnabledStateChangedForCommand(int id, bool enabled);
 
   // Overridden from MenuGtk::Delegate:
   virtual void StoppedShowing();
 
   // Overridden from menus::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdEnabled(int id) const;
   virtual bool IsCommandIdChecked(int id) const;
   virtual void ExecuteCommand(int id);
@@ skipping 57 matching lines @@
                                        BrowserToolbarGtk* toolbar);
 
   // Gtk callback for the "clicked" signal.
   static void OnButtonClick(GtkWidget* button, BrowserToolbarGtk* toolbar);
 
   // Gtk callback to intercept mouse clicks to the menu buttons.
   static gboolean OnMenuButtonPressEvent(GtkWidget* button,
                                          GdkEventButton* event,
                                          BrowserToolbarGtk* toolbar);
 
-  // Gtk callback used when a hotkey activates the menu buttons.
-  static gboolean OnMenuClicked(GtkWidget* button,
-                                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);
 
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
@@ skipping 60 matching lines @@
   // 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_