| Index: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
|
| diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
|
| index f72c0e9d11685f6a20a50b45859bc4bc55390daf..a163cc39335a855194f596ef2b3aaf97aa28609f 100644
|
| --- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
|
| +++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "chrome/browser/extensions/api/commands/command_service.h"
|
| #include "chrome/browser/extensions/api/commands/command_service_factory.h"
|
| -#include "chrome/browser/extensions/browser_event_router.h"
|
| #include "chrome/browser/extensions/extension_keybinding_registry.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -22,8 +21,9 @@ void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
|
| ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews(
|
| Profile* profile,
|
| views::FocusManager* focus_manager,
|
| - ExtensionFilter extension_filter)
|
| - : ExtensionKeybindingRegistry(profile, extension_filter),
|
| + ExtensionFilter extension_filter,
|
| + Delegate* delegate)
|
| + : ExtensionKeybindingRegistry(profile, extension_filter, delegate),
|
| profile_(profile),
|
| focus_manager_(focus_manager) {
|
| Init();
|
| @@ -87,16 +87,13 @@ void ExtensionKeybindingRegistryViews::RemoveExtensionKeybinding(
|
|
|
| bool ExtensionKeybindingRegistryViews::AcceleratorPressed(
|
| const ui::Accelerator& accelerator) {
|
| - ExtensionService* service = profile_->GetExtensionService();
|
| -
|
| EventTargets::iterator it = event_targets_.find(accelerator);
|
| if (it == event_targets_.end()) {
|
| NOTREACHED(); // Shouldn't get this event for something not registered.
|
| return false;
|
| }
|
|
|
| - service->browser_event_router()->CommandExecuted(
|
| - profile_, it->second.first, it->second.second);
|
| + CommandExecuted(it->second.first, it->second.second);
|
|
|
| return true;
|
| }
|
|
|