Handle Caps Lock short cut (Shift+Search) in ash [part 2 of 2].

chrome/browser/chromeos/system_key_event_listener.cc

 // Copyright (c) 2011 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>
@@ skipping 287 matching lines @@
   if (xevent->type == KeyPress || xevent->type == KeyRelease) {
     // Change the current keyboard layout (or input method) if xevent is one of
     // the input method hotkeys.
     input_method::HotkeyManager* hotkey_manager =
         input_method_manager->GetHotkeyManager();
     if (hotkey_manager->FilterKeyEvent(*xevent))
       return true;
   }
 
   if (xevent->type == xkb_event_base_) {
+    // TODO(yusukes): Move this part to aura::RootWindowHost.
     XkbEvent* xkey_event = reinterpret_cast<XkbEvent*>(xevent);
     if (xkey_event->any.xkb_type == XkbStateNotify) {
       input_method::ModifierLockStatus new_caps_lock_state =
           input_method::kDontChange;
       input_method::ModifierLockStatus new_num_lock_state =
           input_method::kDontChange;
 
       bool enabled = (xkey_event->state.locked_mods) & LockMask;
       if (caps_lock_is_on_ != enabled) {
         caps_lock_is_on_ = enabled;
@@ skipping 13 matching lines @@
       input_method_manager->GetXKeyboard()->SetLockedModifiers(
           new_caps_lock_state, new_num_lock_state);
 
       return true;
     }
   } else if (xevent->type == KeyPress) {
     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 short cut is handled in ash/.

[Daniel Erat, 2012/01/18 15:44:31]

nit: either just say "Ash" instead of "ash/" or mention the specific class that
handles it

[Yusuke Sato, 2012/01/23 06:53:49]

Done.

       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)
           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();
           return true;
         } else if (keycode == key_f7_ || keycode == key_brightness_up_) {
@@ skipping 18 matching lines @@
           OnVolumeUp();
           return true;
         }
       }
     }
   }
   return false;
 }
 
 }  // namespace chromeos