| 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 d0fb3daeee0fdc768d7c5254e98ee47fe8180de5..2a084e963d21fc3343bd15a6861451e87db70459 100644
|
| --- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
|
| +++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
|
| @@ -11,12 +11,6 @@
|
| #include "extensions/common/extension.h"
|
| #include "ui/views/focus/focus_manager.h"
|
|
|
| -// static
|
| -void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
|
| - bool suspended) {
|
| - views::FocusManager::set_shortcut_handling_suspended(suspended);
|
| -}
|
| -
|
| ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews(
|
| Profile* profile,
|
| views::FocusManager* focus_manager,
|
| @@ -26,9 +20,11 @@ ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews(
|
| profile_(profile),
|
| focus_manager_(focus_manager) {
|
| Init();
|
| + focus_manager->AddAcceleratorPreProcessor(this);
|
| }
|
|
|
| ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() {
|
| + focus_manager_->RemoveAcceleratorProcessor(this);
|
| focus_manager_->UnregisterAccelerators(this);
|
| }
|
|
|
| @@ -70,6 +66,18 @@ void ExtensionKeybindingRegistryViews::RemoveExtensionKeybindingImpl(
|
| focus_manager_->UnregisterAccelerator(accelerator, this);
|
| }
|
|
|
| +bool ExtensionKeybindingRegistryViews::ProcessAccelerator(
|
| + const ui::Accelerator& accelerator) {
|
| + // Consume the accelerator if shortcut handling is suspended.
|
| + return IsShortcutHandlingSuspended();
|
| +}
|
| +
|
| +ui::AcceleratorTarget*
|
| +ExtensionKeybindingRegistryViews::GetTargetForAccelerator(
|
| + const ui::Accelerator& accelerator) const {
|
| + return nullptr;
|
| +}
|
| +
|
| bool ExtensionKeybindingRegistryViews::AcceleratorPressed(
|
| const ui::Accelerator& accelerator) {
|
| std::string extension_id, command_name;
|
|
|