Implement accelerators in the gtk port.

chrome/browser/gtk/browser_toolbar_view_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/browser_toolbar_view_gtk.h"
 
+#include <gdk/gdkkeysyms.h>
+
 #include "base/logging.h"
 #include "base/base_paths_linux.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/back_forward_menu_model_gtk.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/common/l10n_util.h"
@@ skipping 22 matching lines @@
 
   back_menu_model_.reset(new BackForwardMenuModelGtk(
       browser, BackForwardMenuModel::BACKWARD_MENU_DELEGATE));
   forward_menu_model_.reset(new BackForwardMenuModelGtk(
       browser, BackForwardMenuModel::FORWARD_MENU_DELEGATE));
 }
 
 BrowserToolbarGtk::~BrowserToolbarGtk() {
 }
 
-void BrowserToolbarGtk::Init(Profile* profile) {
+void BrowserToolbarGtk::Init(Profile* profile, GtkAccelGroup* accel_group) {
+  accel_group_ = accel_group;
+
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
 
   toolbar_ = gtk_hbox_new(FALSE, 0);
   gtk_container_set_border_width(GTK_CONTAINER(toolbar_), 4);
   // TODO(evanm): this setting of the x-size to 0 makes it so the window
   // can be resized arbitrarily small.  We should figure out what we want
   // with respect to resizing before engineering around it, though.
   gtk_widget_set_size_request(toolbar_, 0, kToolbarHeight);
 
   toolbar_tooltips_ = gtk_tooltips_new();
 
   back_.reset(BuildBackForwardButton(IDR_BACK, IDR_BACK_P, IDR_BACK_H,
               IDR_BACK_D,
               l10n_util::GetString(IDS_TOOLTIP_BACK)));
+  AddAcceleratorToButton(back_, GDK_Left, GDK_MOD1_MASK);
   forward_.reset(BuildBackForwardButton(IDR_FORWARD, IDR_FORWARD_P,
                  IDR_FORWARD_H, IDR_FORWARD_D,
                  l10n_util::GetString(IDS_TOOLTIP_FORWARD)));
+  AddAcceleratorToButton(forward_, GDK_Right, GDK_MOD1_MASK);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
 
   reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0,
       l10n_util::GetString(IDS_TOOLTIP_RELOAD)));
+  AddAcceleratorToButton(reload_, GDK_r, GDK_CONTROL_MASK);
 
   // TODO(port): we need to dynamically react to changes in show_home_button_
   // and hide/show home appropriately.  But we don't have a UI for it yet.
   if (*show_home_button_)
     home_.reset(MakeHomeButton());
 
   gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new("  "), FALSE, FALSE, 0);
 
   star_.reset(BuildToolbarButton(IDR_STAR, IDR_STAR_P, IDR_STAR_H, IDR_STAR_D,
       l10n_util::GetString(IDS_TOOLTIP_STAR)));
 
   entry_ = gtk_entry_new();
   gtk_widget_set_size_request(entry_, 0, 27);
   g_signal_connect(G_OBJECT(entry_), "activate",
                    G_CALLBACK(OnEntryActivate), this);
+  gtk_widget_add_accelerator(
+      entry_, "grab-focus", accel_group_, GDK_l,
+      GDK_CONTROL_MASK, GtkAccelFlags(0));
+
   gtk_box_pack_start(GTK_BOX(toolbar_), entry_, TRUE, TRUE, 0);
 
   go_.reset(BuildToolbarButton(IDR_GO, IDR_GO_P, IDR_GO_H, 0, L""));
 
   gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
 
   page_menu_button_.reset(BuildToolbarMenuButton(IDR_MENU_PAGE,
       l10n_util::GetString(IDS_PAGEMENU_TOOLTIP)));
+  page_menu_.reset(new MenuGtk(this, GetStandardPageMenu(), accel_group_));
+
   app_menu_button_.reset(BuildToolbarMenuButton(IDR_MENU_CHROME,
       l10n_util::GetStringF(IDS_APPMENU_TOOLTIP,
                             l10n_util::GetString(IDS_PRODUCT_NAME))));
+  app_menu_.reset(new MenuGtk(this, GetStandardAppMenu(), accel_group_));
 
   SetProfile(profile);
 }
 
 void BrowserToolbarGtk::AddToolbarToBox(GtkWidget* box) {
   gtk_box_pack_start(GTK_BOX(box), toolbar_, FALSE, FALSE, 0);
 }
 
 void BrowserToolbarGtk::EnabledStateChangedForCommand(int id, bool enabled) {
   GtkWidget* widget = NULL;
@@ skipping 183 matching lines @@
                    G_CALLBACK(OnButtonClick), this);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
   // Popup the menu as left-aligned relative to this widget rather than the
   // default of right aligned.
   g_object_set_data(G_OBJECT(button->widget()), "left-align-popup",
                     reinterpret_cast<void*>(true));
   return button;
 }
 
+void BrowserToolbarGtk::AddAcceleratorToButton(
+    const scoped_ptr<CustomDrawButton>& button,
+    unsigned int accelerator,
+    unsigned int accelerator_mod) {
+  gtk_widget_add_accelerator(
+      button->widget(), "clicked", accel_group_, accelerator,
+      GdkModifierType(accelerator_mod), GtkAccelFlags(0));
+}
+
 // static
 gboolean BrowserToolbarGtk::OnBackForwardPressEvent(GtkWidget* widget,
     GdkEventButton* event,
     BrowserToolbarGtk* toolbar) {
   // TODO(port): only allow left clicks to open the menu.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       toolbar->show_menu_factory_.NewRunnableMethod(
           &BrowserToolbarGtk::ShowBackForwardMenu,
           widget, event->button),
       kMenuTimerDelay);
   return FALSE;
 }
 
 void BrowserToolbarGtk::ShowBackForwardMenu(GtkWidget* widget,
                                             gint button_type) {
   if (widget == back_->widget()) {
     back_forward_menu_.reset(new MenuGtk(back_menu_model_.get()));
   } else {
     back_forward_menu_.reset(new MenuGtk(forward_menu_model_.get()));
   }
 
   back_forward_menu_->Popup(widget, button_type, gtk_get_current_event_time());
 }
 
 void BrowserToolbarGtk::RunPageMenu(GdkEvent* button_press_event) {
-  if (page_menu_ == NULL) {
-    page_menu_.reset(new MenuGtk(this, GetStandardPageMenu()));
-  }
-
   page_menu_->Popup(page_menu_button_->widget(), button_press_event);
 }
 
 void BrowserToolbarGtk::RunAppMenu(GdkEvent* button_press_event) {
-  if (app_menu_ == NULL) {
-    app_menu_.reset(new MenuGtk(this, GetStandardAppMenu()));
-  }
-
   app_menu_->Popup(app_menu_button_->widget(), button_press_event);
 }
 
 CustomDrawButton* BrowserToolbarGtk::MakeHomeButton() {
   return BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
                             l10n_util::GetString(IDS_TOOLTIP_HOME));
 }