Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5606)

Unified Diff: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Fix Mac Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8dfa781d079dec3224f17ae802bb368d793b0f96..9e8dec3f38f3d3a62cf3db71f2cfab8a54df4042 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,
@@ -70,6 +64,11 @@ void ExtensionKeybindingRegistryViews::RemoveExtensionKeybindingImpl(
focus_manager_->UnregisterAccelerator(accelerator, this);
}
+void ExtensionKeybindingRegistryViews::OnShortcutHandlingSuspended(
+ bool suspended) {
+ focus_manager_->set_shortcut_handling_suspended(suspended);
+}
+
bool ExtensionKeybindingRegistryViews::AcceleratorPressed(
const ui::Accelerator& accelerator) {
std::string extension_id, command_name;

Powered by Google App Engine
This is Rietveld 408576698