Merge 123866 - Ignore Shift+Search when spoken feedback is enabled (non-Aura).

chrome/browser/chromeos/system_key_event_listener.cc

 // Copyright (c) 2012 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/system_key_event_listener.h"
 
 #define XK_MISCELLANY 1
 #include <X11/keysymdef.h>
 #include <X11/XF86keysym.h>
 #include <X11/XKBlib.h>
 #undef Status
 
+#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/input_method/hotkey_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/ui/brightness_bubble.h"
 #include "chrome/browser/chromeos/ui/volume_bubble.h"
 #include "chrome/browser/extensions/system/system_api.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 312 matching lines @@
     const int32 keycode = xevent->xkey.keycode;
     if (keycode) {
       const unsigned int state = (xevent->xkey.state & kSupportedModifiers);
 
 #if !defined(USE_AURA)
       // Toggle Caps Lock if Shift and Search keys are pressed.
       // When Aura is in use, the shortcut is handled in Ash.
       if (XKeycodeToKeysym(ui::GetXDisplay(), keycode, 0) == XK_Super_L) {
         const bool shift_is_held = (state & ShiftMask);
         const bool other_mods_are_held = (state & ~(ShiftMask | LockMask));
-        if (shift_is_held && !other_mods_are_held)
+
+        // When spoken feedback is enabled, the Search key is used as an
+        // accessibility modifier key.
+        const bool accessibility_enabled =
+            accessibility::IsAccessibilityEnabled();
+
+        if (shift_is_held && !other_mods_are_held && !accessibility_enabled) {
           input_method_manager->GetXKeyboard()->SetCapsLockEnabled(
               !caps_lock_is_on_);
+        }
       }
 #endif
 
       // Only doing non-Alt/Shift/Ctrl modified keys
       if (!(state & (Mod1Mask | ShiftMask | ControlMask))) {
         if (keycode == key_f6_ || keycode == key_brightness_down_) {
           if (keycode == key_f6_)
             content::RecordAction(
                 UserMetricsAction("Accel_BrightnessDown_F6"));
           OnBrightnessDown();
@@ skipping 20 matching lines @@
           OnVolumeUp();
           return true;
         }
       }
     }
   }
   return false;
 }
 
 }  // namespace chromeos