Fixing caps lock problems under ChromeOS where the tray does not properly follow the real caps lock…

ash/system/chromeos/tray_caps_lock.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 "ash/system/chromeos/tray_caps_lock.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ash/system/tray/actionable_view.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
@@ skipping 111 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(CapsLockDefaultView);
 };
 
 TrayCapsLock::TrayCapsLock(SystemTray* system_tray)
     : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_CAPS_LOCK),
       default_(NULL),
       detailed_(NULL),
       caps_lock_enabled_(CapsLockIsEnabled()),
       message_shown_(false) {
-  // Make sure the event is processed by this before the IME.
-  Shell::GetInstance()->PrependPreTargetHandler(this);
+  chromeos::input_method::XKeyboard* xkeyboard =
+      chromeos::input_method::InputMethodManager::Get()->GetXKeyboard();
+  xkeyboard->AddObserver(this);
 }
 
 TrayCapsLock::~TrayCapsLock() {
-  Shell::GetInstance()->RemovePreTargetHandler(this);
+  chromeos::input_method::XKeyboard* xkeyboard =
+      chromeos::input_method::InputMethodManager::Get()->GetXKeyboard();
+  xkeyboard->RemoveObserver(this);
 }
 
-void TrayCapsLock::OnCapsLockChanged(bool enabled) {
+void TrayCapsLock::OnCapsLockChanged() {
+  caps_lock_enabled_ = !caps_lock_enabled_;

[Daniel Erat, 2014/04/09 20:27:00]

i don't like this -- it seems like it's too easy to get out of sync and never
get back in sync. at the very least this method should be renamed to
OnCapsLockToggled(), but i'd prefer that we either continued to pass the new
state or queried the current state here instead of just blindly inverting the
bool.

[Mr4D (OOO till 08-26), 2014/04/09 23:27:02]

Done!

+
   if (tray_view())
-    tray_view()->SetVisible(enabled);
-
-  caps_lock_enabled_ = enabled;
+    tray_view()->SetVisible(caps_lock_enabled_);
 
   if (default_) {
-    default_->Update(enabled);
+    default_->Update(caps_lock_enabled_);
   } else {
-    if (enabled) {
+    if (caps_lock_enabled_) {
       if (!message_shown_) {
         Shell::GetInstance()->metrics()->RecordUserMetricsAction(
             ash::UMA_STATUS_AREA_CAPS_LOCK_POPUP);
         PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
         message_shown_ = true;
       }
     } else if (detailed_) {
       detailed_->GetWidget()->Close();
     }
   }
 }
 
-void TrayCapsLock::OnKeyEvent(ui::KeyEvent* key) {
-  if (key->type() == ui::ET_KEY_PRESSED && key->key_code() == ui::VKEY_CAPITAL)
-    OnCapsLockChanged(!caps_lock_enabled_);
-}
-
 bool TrayCapsLock::GetInitialVisibility() {
   return CapsLockIsEnabled();
 }
 
 views::View* TrayCapsLock::CreateDefaultView(user::LoginStatus status) {
   if (!caps_lock_enabled_)
     return NULL;
   DCHECK(default_ == NULL);
   default_ = new CapsLockDefaultView;
   default_->Update(caps_lock_enabled_);
@@ skipping 31 matching lines @@
 
 void TrayCapsLock::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 }  // namespace ash