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

Unified Diff: chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc

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/gtk/extensions/extension_keybinding_registry_gtk.cc
diff --git a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
index ccb02561afeac1e141559ed15d34d2f2ba7b729d..0a20b75a2e2afce4d6e7975cb485752f6dc0bc9f 100644
--- a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/api/commands/command_service.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/gtk/accelerators_gtk.h"
#include "chrome/common/extensions/extension.h"
#include "ui/base/accelerators/platform_accelerator_gtk.h"
@@ -18,6 +19,19 @@ void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
ExtensionKeybindingRegistryGtk::set_shortcut_handling_suspended(suspended);
}
+// static
+bool extensions::ExtensionKeybindingRegistry::IsChromeAccelerator(
+ const ui::Accelerator& accelerator) {
+ AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance();
+ for (AcceleratorsGtk::const_iterator iter = accelerators->begin();
+ iter != accelerators->end(); ++iter) {
+ if (iter->second.key_code() == accelerator.key_code() &&
+ iter->second.modifiers() == accelerator.modifiers())
+ return true;
+ }
+ return false;
+}
+
bool ExtensionKeybindingRegistryGtk::shortcut_handling_suspended_ = false;
ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk(

Powered by Google App Engine
This is Rietveld 408576698