Support search as a sticky key.

chrome/browser/chromeos/events/event_rewriter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/events/event_rewriter.h"
 
 #include <vector>
 
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/wm/window_state.h"
@@ skipping 87 matching lines @@
 bool IsISOLevel5ShiftUsedByCurrentInputMethod() {
   // Since both German Neo2 XKB layout and Caps Lock depend on Mod3Mask,
   // it's not possible to make both features work. For now, we don't remap
   // Mod3Mask when Neo2 is in use.
   // TODO(yusukes): Remove the restriction.
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   return manager->IsISOLevel5ShiftUsedByCurrentInputMethod();
 }
 
-bool IsExtensionCommandRegistered(const ui::KeyEvent& key_event) {
+bool IsExtensionCommandRegistered(ui::KeyboardCode key_code, int flags) {
   // 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.
   Profile* profile = ProfileManager::GetActiveUserProfile();
   if (!profile || !extensions::ExtensionCommandsGlobalRegistry::Get(profile))
     return false;
 
-  int modifiers = key_event.flags() & (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN |
-                                       ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN);
-  ui::Accelerator accelerator(key_event.key_code(), modifiers);
+  int modifiers = flags & (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN |
+                           ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN);
+  ui::Accelerator accelerator(key_code, modifiers);
   return extensions::ExtensionCommandsGlobalRegistry::Get(profile)
       ->IsRegistered(accelerator);
 }
 
 EventRewriter::DeviceType GetDeviceType(const std::string& device_name) {
   std::vector<std::string> tokens;
   Tokenize(device_name, " .", &tokens);
 
   // If the |device_name| contains the two words, "apple" and "keyboard", treat
   // it as an Apple keyboard.
@@ skipping 240 matching lines @@
     remapped_state->key_code = map.output_key_code;
     remapped_state->flags = (input.flags & ~map.input_flags) | map.output_flags;
     return true;
   }
   return false;
 }
 
 ui::EventRewriteStatus EventRewriter::RewriteKeyEvent(
     const ui::KeyEvent& key_event,
     scoped_ptr<ui::Event>* rewritten_event) {
-  if (IsExtensionCommandRegistered(key_event))
+  if (IsExtensionCommandRegistered(key_event.key_code(), key_event.flags()))
     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()};
   // Do not rewrite an event sent by ui_controls::SendKeyPress(). See
   // crbug.com/136465.
   if (!(key_event.flags() & ui::EF_FINAL)) {
     RewriteModifierKeys(key_event, &state);
     RewriteNumPadKeys(key_event, &state);
   }
   ui::EventRewriteStatus status = ui::EVENT_REWRITE_CONTINUE;
+  bool is_sticky_key_extension_command = false;
   if (sticky_keys_controller_) {
     status = sticky_keys_controller_->RewriteKeyEvent(
         key_event, state.key_code, &state.flags);
+    is_sticky_key_extension_command =
+        IsExtensionCommandRegistered(state.key_code, state.flags);

[Finnur, 2014/09/24 10:48:41]

This block should probably be below line 405.

[David Tseng, 2014/09/24 16:24:28]

Done.

     if (status == ui::EVENT_REWRITE_DISCARD)
       return ui::EVENT_REWRITE_DISCARD;
   }
+  // Only rewrite keys involving the search modifier if it has no extensions
+  // binding the command.

[Finnur, 2014/09/24 10:48:41]

This comment seems a little out of place here. Why is search (note: Search)
referred to here specifically? It wouldn't be the only modifier we don't want to
rewrite, right?

[David Tseng, 2014/09/24 16:24:28]

Was fixated on Search for the fix; rephrased to be much clearer.

+  if (!is_sticky_key_extension_command) {
   if (!(key_event.flags() & ui::EF_FINAL)) {

[Finnur, 2014/09/24 10:48:41]

The indentation here is now wrong, but we anyway prefer:

  if (!foo && !bar)
    ...

... over ...

  if (!foo) {
    if (!bar) {
      ...

[David Tseng, 2014/09/24 16:24:28]

Done.

     RewriteExtendedKeys(key_event, &state);
     RewriteFunctionKeys(key_event, &state);
   }
+  }
   if ((key_event.flags() == state.flags) &&
       (key_event.key_code() == state.key_code) &&
 #if defined(USE_X11)
       // TODO(kpschoedel): This test is present because several consumers of
       // key events depend on having a native core X11 event, so we rewrite
       // all XI2 key events (GenericEvent) into corresponding core X11 key
       // events. Remove this when event consumers no longer care about
       // native X11 event details (crbug.com/380349).
       (!key_event.HasNativeEvent() ||
        (key_event.native_event()->type != GenericEvent)) &&
@@ skipping 468 matching lines @@
     KeyboardDeviceAddedInternal(device_info[i].deviceid, device_info[i].name);
   }
 
   XIFreeDeviceInfo(device_info);
 #else
   KeyboardDeviceAddedInternal(device_id, "keyboard");
 #endif
 }
 
 }  // namespace chromeos