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

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

Issue 13044014: Make sure manifest specified shortcut for Extension Command can not override the built-in shortcuts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disabling test for Mac (not implemented yet) Created 7 years, 8 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/cocoa/extensions/extension_keybinding_registry_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm
index 1ee3c0f652ff0796967cc7d8273d8dac7a7211e2..2d2cfbc90e8f84d68447bd5a6191b288f062697f 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm
@@ -21,6 +21,13 @@ void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
ExtensionKeybindingRegistryCocoa::set_shortcut_handling_suspended(suspended);
}
+// static
+bool extensions::ExtensionKeybindingRegistry::IsChromeAccelerator(
+ const ui::Accelerator& accelerator) {
+ // TODO(finnur): Implement this.
Yoyo Zhou 2013/04/05 18:09:50 Is the issue that AcceleratorsCocoa doesn't give y
Finnur 2013/04/05 19:50:03 The issue is that the CL for Views and GTK was rea
+ return false;
+}
+
bool ExtensionKeybindingRegistryCocoa::shortcut_handling_suspended_ = false;
ExtensionKeybindingRegistryCocoa::ExtensionKeybindingRegistryCocoa(

Powered by Google App Engine
This is Rietveld 408576698