Index: chrome/browser/ui/views/browser_actions_container.cc |
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc |
index 7e011b528ecede14f5da0faca42f21f33016f334..5b3af3f5c7665d98d067a54262bc11490c1c9654 100644 |
--- a/chrome/browser/ui/views/browser_actions_container.cc |
+++ b/chrome/browser/ui/views/browser_actions_container.cc |
@@ -35,6 +35,10 @@ |
#include "ui/views/metrics.h" |
#include "ui/views/widget/widget.h" |
+// TODO(finnur): Remove when I've found a more permanent location for the global |
+// shortcut listener. |
+#include "chrome/browser/ui/views/extensions/extension_commands_global_registry_views.h" |
+ |
using extensions::Extension; |
namespace { |
@@ -80,11 +84,15 @@ BrowserActionsContainer::BrowserActionsContainer(Browser* browser, |
model_->AddObserver(this); |
} |
+ // TODO(finnur): find a better place for this. |
+ extensions::ExtensionCommandsGlobalRegistryViews::GetFactoryInstance()-> |
+ GetForProfile(browser->profile()); |
+ |
extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( |
browser->profile(), |
owner_view->GetFocusManager(), |
extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS, |
- this)), |
+ this)); |
resize_animation_.reset(new gfx::SlideAnimation(this)); |
resize_area_ = new views::ResizeArea(this); |