Index: chrome/browser/chromeos/system_key_event_listener.cc |
diff --git a/chrome/browser/chromeos/system_key_event_listener.cc b/chrome/browser/chromeos/system_key_event_listener.cc |
index 6740eafb5f2e9bb1feda7c279dae6ac7720d4b37..e0231b8ba9b37cb4f46f755cd1eda1da55b6ae22 100644 |
--- a/chrome/browser/chromeos/system_key_event_listener.cc |
+++ b/chrome/browser/chromeos/system_key_event_listener.cc |
@@ -305,6 +305,7 @@ bool SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) { |
} |
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 = |
@@ -338,7 +339,9 @@ bool SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) { |
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 me
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)); |
@@ -346,6 +349,7 @@ bool SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) { |
input_method_manager->GetXKeyboard()->SetCapsLockEnabled( |
!caps_lock_is_on_); |
} |
+#endif |
// Only doing non-Alt/Shift/Ctrl modified keys |
if (!(state & (Mod1Mask | ShiftMask | ControlMask))) { |