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

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

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Use overrides 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.h
diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h
index 65decac1e626819f836f0eeda9779acc4a90c518..3643b66fb634c3cafada1b33aad97fba79898012 100644
--- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h
+++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h
@@ -37,6 +37,9 @@ class ExtensionKeybindingRegistryViews
Delegate* delegate);
~ExtensionKeybindingRegistryViews() override;
+ // Overridden from ExtensingKeybindingRegistry.
+ void SetShortcutHandlingSuspended(bool suspended) override;
Devlin 2015/01/15 22:41:43 Is there a reason this can't go at line 48 with th
Andre 2015/01/16 18:40:15 Done.
+
// Overridden from ui::AcceleratorTarget.
bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
bool CanHandleAccelerators() const override;

Powered by Google App Engine
This is Rietveld 408576698