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 99b0b2d733012e0a9fe9bbf4814e586b46d6d289..220fe98abf70bd0380237bd54a4824ecce8b662d 100644 |
--- a/chrome/browser/ui/views/extensions/shell_window_views.cc |
+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc |
@@ -6,6 +6,7 @@ |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/extensions/extension_host.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" |
@@ -326,6 +327,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_APP_ONLY)); |
+ |
OnViewWasResized(); |
window_->Show(); |
@@ -593,7 +600,8 @@ void ShellWindowViews::UpdateDraggableRegions( |
void ShellWindowViews::HandleKeyboardEvent( |
const content::NativeWebKeyboardEvent& event) { |
- // No-op. |
+ unhandled_keyboard_event_handler_.HandleKeyboardEvent(event, |
+ GetFocusManager()); |
} |
// static |