Track the active ExtensionKeybindingRegistry and make it available to EventRewriter.

chrome/browser/chromeos/events/event_rewriter.cc

Index: chrome/browser/chromeos/events/event_rewriter.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc
index 314a3ecd272cc4987b081631fbc14a31bac25219..865dcd712da2ff6d2793f3928193adaa20477fc5 100644
--- a/chrome/browser/chromeos/events/event_rewriter.cc
+++ b/chrome/browser/chromeos/events/event_rewriter.cc
@@ -17,6 +17,9 @@
 #include "base/sys_info.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/ime/ime_keyboard.h"
@@ -104,6 +107,43 @@ bool IsISOLevel5ShiftUsedByCurrentInputMethod() {
   return manager->IsISOLevel5ShiftUsedByCurrentInputMethod();
 }
 
+bool IsExtensionCommandRegistered(const ui::KeyEvent& key_event) {
+  // Some keyboard events for ChromeOS get rewritten, such as:
+  // Search+Shift+Left gets converted to Shift+Home (BeginDocument).
+  // This doesn't make sense if the user has assigned that shortcut
+  // to an extension. Because:
+  // 1) The extension would, upon seeing a request for Ctrl+Shift+Home have
+  //    to register for Shift+Home, instead.
+  // 2) The conversion is unnecessary, because Shift+Home (BeginDocument) isn't
+  //    going to be executed.
+  // Therefore, we skip converting the accelerator if an extension has
+  // registered for this shortcut.
+  const BrowserList* ash_browser_list =
+      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+  for (BrowserList::const_reverse_iterator browser_iterator =
+           ash_browser_list->begin_last_active();
+       browser_iterator != ash_browser_list->end_last_active();
+       ++browser_iterator) {
+    BrowserWindow* window = (*browser_iterator)->window();
+
+    if (window->IsActive()) {
+      int modifiers = ui::EF_NONE;
+      if (key_event.IsShiftDown())
+        modifiers |= ui::EF_SHIFT_DOWN;
+      if (key_event.IsControlDown())
+        modifiers |= ui::EF_CONTROL_DOWN;
+      if (key_event.IsAltDown())
+        modifiers |= ui::EF_ALT_DOWN;
+      if (key_event.IsCommandDown())
+        modifiers |= ui::EF_COMMAND_DOWN;
+      ui::Accelerator accelerator(key_event.key_code(), modifiers);
+      if (window->IsExtensionCommandRegistered(accelerator))
+        return true;
+    }
+  }
+  return false;
+}
+
 EventRewriter::DeviceType GetDeviceType(const std::string& device_name) {
   std::vector<std::string> tokens;
   Tokenize(device_name, " .", &tokens);
@@ -360,6 +400,8 @@ bool EventRewriter::RewriteWithKeyboardRemappingsByKeyCode(
 ui::EventRewriteStatus EventRewriter::RewriteKeyEvent(
     const ui::KeyEvent& key_event,
     scoped_ptr<ui::Event>* rewritten_event) {
+  if (IsExtensionCommandRegistered(key_event))
+    return ui::EVENT_REWRITE_CONTINUE;
   if (key_event.source_device_id() != ui::ED_UNKNOWN_DEVICE)
     DeviceKeyPressedOrReleased(key_event.source_device_id());
   MutableKeyState state = {key_event.flags(), key_event.key_code()};