OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/gtk/browser_toolbar_gtk.h" | 5 #include "chrome/browser/gtk/browser_toolbar_gtk.h" |
6 | 6 |
7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
| 8 #include <X11/XF86keysym.h> |
8 | 9 |
9 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 11 #include "app/resource_bundle.h" |
11 #include "base/logging.h" | 12 #include "base/logging.h" |
12 #include "base/base_paths_linux.h" | 13 #include "base/base_paths_linux.h" |
13 #include "base/path_service.h" | 14 #include "base/path_service.h" |
14 #include "chrome/app/chrome_dll_resource.h" | 15 #include "chrome/app/chrome_dll_resource.h" |
15 #include "chrome/browser/browser.h" | 16 #include "chrome/browser/browser.h" |
16 #include "chrome/browser/browser_theme_provider.h" | 17 #include "chrome/browser/browser_theme_provider.h" |
17 #include "chrome/browser/gtk/back_forward_button_gtk.h" | 18 #include "chrome/browser/gtk/back_forward_button_gtk.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 gtk_window_add_accel_group(top_level_window, accel_group_); | 110 gtk_window_add_accel_group(top_level_window, accel_group_); |
110 | 111 |
111 // Group back and forward into an hbox so there's no spacing between them. | 112 // Group back and forward into an hbox so there's no spacing between them. |
112 GtkWidget* back_forward_hbox_ = gtk_hbox_new(FALSE, 0); | 113 GtkWidget* back_forward_hbox_ = gtk_hbox_new(FALSE, 0); |
113 | 114 |
114 back_.reset(new BackForwardButtonGtk(browser_, false)); | 115 back_.reset(new BackForwardButtonGtk(browser_, false)); |
115 gtk_box_pack_start(GTK_BOX(back_forward_hbox_), back_->widget(), FALSE, | 116 gtk_box_pack_start(GTK_BOX(back_forward_hbox_), back_->widget(), FALSE, |
116 FALSE, 0); | 117 FALSE, 0); |
117 AddAcceleratorToButton(back_->widget(), GDK_Left, GDK_MOD1_MASK); | 118 AddAcceleratorToButton(back_->widget(), GDK_Left, GDK_MOD1_MASK); |
118 AddAcceleratorToButton(back_->widget(), GDK_BackSpace, 0); | 119 AddAcceleratorToButton(back_->widget(), GDK_BackSpace, 0); |
| 120 AddAcceleratorToButton(back_->widget(), XF86XK_Back, 0); |
119 | 121 |
120 forward_.reset(new BackForwardButtonGtk(browser_, true)); | 122 forward_.reset(new BackForwardButtonGtk(browser_, true)); |
121 gtk_box_pack_start(GTK_BOX(back_forward_hbox_), forward_->widget(), FALSE, | 123 gtk_box_pack_start(GTK_BOX(back_forward_hbox_), forward_->widget(), FALSE, |
122 FALSE, 0); | 124 FALSE, 0); |
123 AddAcceleratorToButton(forward_->widget(), GDK_Right, GDK_MOD1_MASK); | 125 AddAcceleratorToButton(forward_->widget(), GDK_Right, GDK_MOD1_MASK); |
124 AddAcceleratorToButton(forward_->widget(), GDK_BackSpace, GDK_SHIFT_MASK); | 126 AddAcceleratorToButton(forward_->widget(), GDK_BackSpace, GDK_SHIFT_MASK); |
| 127 AddAcceleratorToButton(forward_->widget(), XF86XK_Forward, 0); |
125 gtk_box_pack_start(GTK_BOX(toolbar_), back_forward_hbox_, FALSE, FALSE, 0); | 128 gtk_box_pack_start(GTK_BOX(toolbar_), back_forward_hbox_, FALSE, FALSE, 0); |
126 | 129 |
127 reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0, | 130 reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0, |
128 l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD))); | 131 l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD))); |
129 AddAcceleratorToButton(reload_->widget(), GDK_r, GDK_CONTROL_MASK); | 132 AddAcceleratorToButton(reload_->widget(), GDK_r, GDK_CONTROL_MASK); |
130 AddAcceleratorToButton(reload_->widget(), GDK_F5, GdkModifierType(0)); | 133 AddAcceleratorToButton(reload_->widget(), GDK_F5, GdkModifierType(0)); |
131 AddAcceleratorToButton(reload_->widget(), GDK_F5, GDK_CONTROL_MASK); | 134 AddAcceleratorToButton(reload_->widget(), GDK_F5, GDK_CONTROL_MASK); |
| 135 AddAcceleratorToButton(reload_->widget(), XF86XK_Reload, GdkModifierType(0)); |
| 136 AddAcceleratorToButton(reload_->widget(), XF86XK_Refresh, GdkModifierType(0)); |
132 | 137 |
133 home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0, | 138 home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0, |
134 l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME))); | 139 l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME))); |
135 gtk_util::SetButtonTriggersNavigation(home_->widget()); | 140 gtk_util::SetButtonTriggersNavigation(home_->widget()); |
136 | 141 |
137 // Group the start, omnibox, and go button into an hbox. | 142 // Group the start, omnibox, and go button into an hbox. |
138 GtkWidget* omnibox_hbox_ = gtk_hbox_new(FALSE, 0); | 143 GtkWidget* omnibox_hbox_ = gtk_hbox_new(FALSE, 0); |
139 star_.reset(BuildStarButton(l10n_util::GetStringUTF8(IDS_TOOLTIP_STAR))); | 144 star_.reset(BuildStarButton(l10n_util::GetStringUTF8(IDS_TOOLTIP_STAR))); |
140 gtk_box_pack_start(GTK_BOX(omnibox_hbox_), star_->widget(), FALSE, FALSE, 0); | 145 gtk_box_pack_start(GTK_BOX(omnibox_hbox_), star_->widget(), FALSE, FALSE, 0); |
141 | 146 |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 widget, "clicked", accel_group_, accelerator, | 421 widget, "clicked", accel_group_, accelerator, |
417 GdkModifierType(accelerator_mod), GtkAccelFlags(0)); | 422 GdkModifierType(accelerator_mod), GtkAccelFlags(0)); |
418 } | 423 } |
419 | 424 |
420 void BrowserToolbarGtk::InitNineBox() { | 425 void BrowserToolbarGtk::InitNineBox() { |
421 // TODO(estade): use |profile_|? | 426 // TODO(estade): use |profile_|? |
422 background_ninebox_.reset(new NineBox( | 427 background_ninebox_.reset(new NineBox( |
423 browser_->profile()->GetThemeProvider(), | 428 browser_->profile()->GetThemeProvider(), |
424 0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0)); | 429 0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0)); |
425 } | 430 } |
OLD | NEW |