Implement accelerators in the gtk port.

chrome/browser/gtk/browser_toolbar_view_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_VIEW_GTK_H_
 #define CHROME_BROWSER_GTK_BROWSER_TOOLBAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 #include <string>
 
@@ skipping 17 matching lines @@
                           public MenuGtk::Delegate,
                           public NotificationObserver {
  public:
   // Height of the toolbar, in pixels.
   static const int kToolbarHeight;
 
   explicit BrowserToolbarGtk(Browser* browser);
   virtual ~BrowserToolbarGtk();
 
   // Create the contents of the toolbar
-  void Init(Profile* profile);
+  void Init(Profile* profile, GtkAccelGroup* accel_group);
 
   // Adds this GTK toolbar into a sizing box.
   void AddToolbarToBox(GtkWidget* box);
 
   // Overridden from CommandUpdater::CommandObserver:
   virtual void EnabledStateChangedForCommand(int id, bool enabled);
 
   // Overridden from MenuGtk::Delegate:
   virtual bool IsCommandEnabled(int command_id) const;
   virtual bool IsItemChecked(int id) const;
@@ skipping 14 matching lines @@
   CustomDrawButton* BuildToolbarButton(int normal_id,
                                        int active_id,
                                        int highlight_id,
                                        int depressed_id,
                                        const std::wstring& localized_tooltip);
 
   CustomContainerButton* BuildToolbarMenuButton(
       int icon_id,
       const std::wstring& localized_tooltip);
 
+  // Adds a keyboard accelerator which trigers a button. (i.e., Ctrl+R is now
+  // equivalent to a reload click).
+  void AddAcceleratorToButton(
+      const scoped_ptr<CustomDrawButton>& button,
+      unsigned int accelerator,
+      unsigned int accelerator_mod);
+
   // Gtk callback for the "activate" signal on the |entry_| widget. Responds to
   // enter.
   static void OnEntryActivate(GtkEntry *entry, 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,
                                          GdkEvent *event,
@@ skipping 11 matching lines @@
   // Gtk widgets. The toolbar is an hbox with each of the other pieces of the
   // toolbar placed side by side.
   GtkWidget* toolbar_;
 
   // Tooltip container for all GTK widgets in this class.
   GtkTooltips* toolbar_tooltips_;
 
   // Our temporary URL bar (until we get the omnibox up).
   GtkWidget* entry_;
 
+  // A pointer to our window's accelerator list.
+  GtkAccelGroup* accel_group_;
+
   // All the buttons in the toolbar.
   scoped_ptr<CustomDrawButton> back_, forward_;
   scoped_ptr<CustomDrawButton> reload_;
   scoped_ptr<CustomDrawButton> home_;  // May be NULL.
   scoped_ptr<CustomDrawButton> star_, go_;
   scoped_ptr<CustomContainerButton> page_menu_button_, app_menu_button_;
 
   // The model that contains the security level, text, icon to display...
   ToolbarModel* model_;
 
@@ skipping 32 matching lines @@
   // The back/forward menu gets reset every time it is shown.
   scoped_ptr<MenuGtk> back_forward_menu_;
 
   scoped_ptr<BackForwardMenuModelGtk> back_menu_model_;
   scoped_ptr<BackForwardMenuModelGtk> forward_menu_model_;
 
   ScopedRunnableMethodFactory<BrowserToolbarGtk> show_menu_factory_;
 };
 
 #endif  // CHROME_BROWSER_GTK_BROWSER_TOOLBAR_VIEW_GTK_H_