diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gtk/browser_toolbar_gtk.cc | 20 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_toolbar_gtk.h | 5 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 13 |
3 files changed, 12 insertions, 26 deletions
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index b4d8705..c31d93e 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -115,25 +115,14 @@ void BrowserToolbarGtk::Init(Profile* profile, back_.reset(new BackForwardButtonGtk(browser_, false)); gtk_box_pack_start(GTK_BOX(back_forward_hbox_), back_->widget(), FALSE, FALSE, 0); - AddAcceleratorToButton(back_->widget(), GDK_Left, GDK_MOD1_MASK); - AddAcceleratorToButton(back_->widget(), GDK_BackSpace, 0); - AddAcceleratorToButton(back_->widget(), XF86XK_Back, 0); forward_.reset(new BackForwardButtonGtk(browser_, true)); gtk_box_pack_start(GTK_BOX(back_forward_hbox_), forward_->widget(), FALSE, FALSE, 0); - AddAcceleratorToButton(forward_->widget(), GDK_Right, GDK_MOD1_MASK); - AddAcceleratorToButton(forward_->widget(), GDK_BackSpace, GDK_SHIFT_MASK); - AddAcceleratorToButton(forward_->widget(), XF86XK_Forward, 0); gtk_box_pack_start(GTK_BOX(toolbar_), back_forward_hbox_, FALSE, FALSE, 0); reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0, l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD))); - AddAcceleratorToButton(reload_->widget(), GDK_r, GDK_CONTROL_MASK); - AddAcceleratorToButton(reload_->widget(), GDK_F5, GdkModifierType(0)); - AddAcceleratorToButton(reload_->widget(), GDK_F5, GDK_CONTROL_MASK); - AddAcceleratorToButton(reload_->widget(), XF86XK_Reload, GdkModifierType(0)); - AddAcceleratorToButton(reload_->widget(), XF86XK_Refresh, GdkModifierType(0)); home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0, l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME))); @@ -413,15 +402,6 @@ gboolean BrowserToolbarGtk::OnMenuButtonPressEvent(GtkWidget* button, return TRUE; } -void BrowserToolbarGtk::AddAcceleratorToButton( - GtkWidget* widget, - unsigned int accelerator, - unsigned int accelerator_mod) { - gtk_widget_add_accelerator( - widget, "clicked", accel_group_, accelerator, - GdkModifierType(accelerator_mod), GtkAccelFlags(0)); -} - void BrowserToolbarGtk::InitNineBox() { // TODO(estade): use |profile_|? background_ninebox_.reset(new NineBox( diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h index 3671c14..ffb2fdd 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.h +++ b/chrome/browser/gtk/browser_toolbar_gtk.h @@ -102,11 +102,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver, const std::string& localized_tooltip, OwnedWidgetGtk* owner); - // Adds a keyboard accelerator which triggers a button (e.g., ctrl+r is now - // equivalent to a reload click). - void AddAcceleratorToButton( - GtkWidget*, unsigned int accelerator, unsigned int accelerator_mod); - // Gtk callback for the "expose-event" signal. static gboolean OnToolbarExpose(GtkWidget* widget, GdkEventExpose* e, BrowserToolbarGtk* toolbar); diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index fa3cbd7..372599b 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -171,11 +171,22 @@ const struct AcceleratorMapping { GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, { GDK_F3, IDC_FIND_PREVIOUS, GDK_SHIFT_MASK }, - // Navigation. + // Navigation / toolbar buttons. { GDK_Home, IDC_HOME, GDK_MOD1_MASK }, { XF86XK_HomePage, IDC_HOME, GdkModifierType(0) }, { GDK_Escape, IDC_STOP, GdkModifierType(0) }, { XF86XK_Stop, IDC_STOP, GdkModifierType(0) }, + { GDK_Left, IDC_BACK, GDK_MOD1_MASK }, + { GDK_BackSpace, IDC_BACK, GdkModifierType(0) }, + { XF86XK_Back, IDC_BACK, GdkModifierType(0) }, + { GDK_Right, IDC_FORWARD, GDK_MOD1_MASK }, + { GDK_BackSpace, IDC_FORWARD, GDK_SHIFT_MASK }, + { XF86XK_Forward, IDC_FORWARD, GdkModifierType(0) }, + { GDK_r, IDC_RELOAD, GDK_CONTROL_MASK }, + { GDK_F5, IDC_RELOAD, GdkModifierType(0) }, + { GDK_F5, IDC_RELOAD, GDK_CONTROL_MASK }, + { XF86XK_Reload, IDC_RELOAD, GdkModifierType(0) }, + { XF86XK_Refresh, IDC_RELOAD, GdkModifierType(0) }, // Miscellany. { GDK_d, IDC_STAR, GDK_CONTROL_MASK }, |