Chromium Code Reviews| Index: chrome/browser/ui/gtk/extensions/shell_window_gtk.cc |
| diff --git a/chrome/browser/ui/gtk/extensions/shell_window_gtk.cc b/chrome/browser/ui/gtk/extensions/shell_window_gtk.cc |
| index 2dbb324b37ce387403ade40b104f550cb1f6012e..3d11a017a24dc8e89e869fde8a4dcc1fd7cade9a 100644 |
| --- a/chrome/browser/ui/gtk/extensions/shell_window_gtk.cc |
| +++ b/chrome/browser/ui/gtk/extensions/shell_window_gtk.cc |
| @@ -5,6 +5,7 @@ |
| #include "chrome/browser/ui/gtk/extensions/shell_window_gtk.h" |
| #include "chrome/browser/profiles/profile.h" |
| +#include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h" |
| #include "chrome/browser/ui/gtk/gtk_window_util.h" |
| #include "chrome/browser/web_applications/web_app.h" |
| #include "chrome/common/extensions/draggable_region.h" |
| @@ -92,6 +93,11 @@ ShellWindowGtk::ShellWindowGtk(ShellWindow* shell_window, |
| G_CALLBACK(OnButtonPressThunk), this); |
| } |
| + // Add the keybinding registry, now that the window has been realized. |
|
Evan Stade
2012/09/05 21:38:27
are you sure the window has been realized? Note th
Marijn Kruisselbrink
2012/09/06 18:09:57
Ah yes, I'm not sure actually if ExtensionKeybindi
|
| + extension_keybinding_registry_.reset( |
| + new ExtensionKeybindingRegistryGtk(shell_window_->profile(), window_, |
| + extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY)); |
| + |
| ui::ActiveWindowWatcherX::AddObserver(this); |
| } |