| Index: chrome/browser/gtk/browser_toolbar_view_gtk.h
|
| diff --git a/chrome/browser/gtk/browser_toolbar_view_gtk.h b/chrome/browser/gtk/browser_toolbar_view_gtk.h
|
| index 08a797caa0c0e0ecd39d547e29ee58b73e98d0ab..5cccfbb1cf397db2d0aa3fa7f50b2f50993e2502 100644
|
| --- a/chrome/browser/gtk/browser_toolbar_view_gtk.h
|
| +++ b/chrome/browser/gtk/browser_toolbar_view_gtk.h
|
| @@ -35,7 +35,7 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
|
| 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);
|
| @@ -70,6 +70,13 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
|
| 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);
|
| @@ -101,6 +108,9 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
|
| // 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_;
|
|
|