Handle Caps Lock for Ozone.

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 671 matching lines @@
   }
 
   // Next, remap modifier bits.
   state->flags |=
       GetRemappedModifierMasks(*pref_service, key_event, incoming.flags);
   if (key_event.type() == ui::ET_KEY_PRESSED)
     state->flags |= characteristic_flag;
   else
     state->flags &= ~characteristic_flag;
 
-  // Toggle Caps Lock if the remapped key is ui::VKEY_CAPITAL, but do nothing if
-  // the original key is ui::VKEY_CAPITAL (i.e. a Caps Lock key on an external
-  // keyboard is pressed) since X can handle that case.
+  // Toggle Caps Lock if the remapped key is ui::VKEY_CAPITAL.
   if (key_event.type() == ui::ET_KEY_PRESSED &&
+#if defined(USE_X11)
+      // ... but for X11, do nothing if the original key is ui::VKEY_CAPITAL
+      // (i.e. a Caps Lock key on an external keyboard is pressed) since X
+      // handles that itself.
       incoming.key_code != ui::VKEY_CAPITAL &&
+#endif
       state->key_code == ui::VKEY_CAPITAL) {
     chromeos::input_method::ImeKeyboard* ime_keyboard =
         ime_keyboard_for_testing_
             ? ime_keyboard_for_testing_
             : chromeos::input_method::InputMethodManager::Get()
                   ->GetImeKeyboard();
     ime_keyboard->SetCapsLockEnabled(!ime_keyboard->CapsLockIsEnabled());
   }
 }
 
@@ skipping 289 matching lines @@
   // TODO(spang): Figure out where we can get keyboard vendor/product id from in
   // Ozone/Freon version.
   return KeyboardDeviceAddedInternal(device_id,
                                      "keyboard",
                                      kUnknownVendorId,
                                      kUnknownProductId);
 #endif
 }
 
 }  // namespace chromeos