Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6402)

Unified Diff: chrome/browser/ui/gtk/extensions/shell_window_gtk.cc

Issue 10911020: Enable commands API for platform apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: filter by extension type instead of specific extensions Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..1e34b3aeb9ed7960d211cb087804cf91cfe2a9fc 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.
+ extension_keybinding_registry_.reset(
+ new ExtensionKeybindingRegistryGtk(shell_window_->profile(), window_,
+ extensions::ExtensionKeybindingRegistry::PLATFORM_APP_ONLY));
+
ui::ActiveWindowWatcherX::AddObserver(this);
}

Powered by Google App Engine
This is Rietveld 408576698