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"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
+#include "base/sys_info.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/ime/xkeyboard.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 99 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);
+  // Since keyboard handling differs between ChromeOS and Linux we need to
+  // use different observers depending on the two platforms.
+  if (base::SysInfo::IsRunningOnChromeOS()) {
+    chromeos::input_method::XKeyboard* xkeyboard =
+        chromeos::input_method::InputMethodManager::Get()->GetXKeyboard();
+    xkeyboard->AddObserver(this);
+  } else {
+    Shell::GetInstance()->PrependPreTargetHandler(this);
+  }
 }
 
 TrayCapsLock::~TrayCapsLock() {
-  Shell::GetInstance()->RemovePreTargetHandler(this);
+  // Since keyboard handling differs between ChromeOS and Linux we need to
+  // use different observers depending on the two platforms.
+  if (base::SysInfo::IsRunningOnChromeOS()) {
+    chromeos::input_method::XKeyboard* xkeyboard =
+        chromeos::input_method::InputMethodManager::Get()->GetXKeyboard();
+    xkeyboard->RemoveObserver(this);
+  } else {
+    Shell::GetInstance()->RemovePreTargetHandler(this);
+  }
 }
 
 void TrayCapsLock::OnCapsLockChanged(bool enabled) {
-  if (tray_view())
-    tray_view()->SetVisible(enabled);
-
   caps_lock_enabled_ = enabled;
 
+  if (tray_view())
+    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();
     }
   }
@@ skipping 48 matching lines @@
 
 void TrayCapsLock::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 }  // namespace ash