Index: chrome/browser/ui/views/extensions/shell_window_views.cc |
diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc |
index 79bc1fc9fb08e51f66437eef18a421cdc08e40e1..2c849f8ea25b0bbbc4191ac85a54ca2627860200 100644 |
--- a/chrome/browser/ui/views/extensions/shell_window_views.cc |
+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc |
@@ -8,6 +8,7 @@ |
#include "chrome/browser/extensions/extension_host.h" |
#include "chrome/browser/favicon/favicon_tab_helper.h" |
#include "chrome/browser/ui/tab_contents/tab_contents.h" |
+#include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h" |
#include "chrome/common/extensions/draggable_region.h" |
#include "chrome/common/extensions/extension.h" |
#include "content/public/browser/render_view_host.h" |
@@ -337,6 +338,12 @@ ShellWindowViews::ShellWindowViews(ShellWindow* shell_window, |
UTF8ToWide(app_name), shell_window_->profile()->GetPath()), |
GetWidget()->GetTopLevelWidget()->GetNativeWindow()); |
#endif |
+ |
+ extension_keybinding_registry_.reset( |
+ new ExtensionKeybindingRegistryViews(shell_window_->profile(), |
+ window_->GetFocusManager(), |
+ extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY)); |
+ |
OnViewWasResized(); |
window_->Show(); |
@@ -626,7 +633,8 @@ void ShellWindowViews::UpdateDraggableRegions( |
void ShellWindowViews::HandleKeyboardEvent( |
const content::NativeWebKeyboardEvent& event) { |
- // No-op. |
+ unhandled_keyboard_event_handler_.HandleKeyboardEvent(event, |
+ GetFocusManager()); |
} |
// static |