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

chromeos/ime/xkeyboard.cc

 // Copyright 2013 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 "chromeos/ime/xkeyboard.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <queue>
 #include <set>
@@ skipping 99 matching lines @@
   }
 
   return true;
 }
 
 class XKeyboardImpl : public XKeyboard {
  public:
   XKeyboardImpl();
   virtual ~XKeyboardImpl() {}
 
+  // Adds/removes observer.
+  virtual void AddObserver(Observer* observer) OVERRIDE;
+  virtual void RemoveObserver(Observer* observer) OVERRIDE;
+
   // Overridden from XKeyboard:
   virtual bool SetCurrentKeyboardLayoutByName(
       const std::string& layout_name) OVERRIDE;
   virtual bool ReapplyCurrentKeyboardLayout() OVERRIDE;
   virtual void ReapplyCurrentModifierLockStatus() OVERRIDE;
   virtual void DisableNumLock() OVERRIDE;
   virtual void SetCapsLockEnabled(bool enable_caps_lock) OVERRIDE;
   virtual bool CapsLockIsEnabled() OVERRIDE;
   virtual bool IsISOLevel5ShiftAvailable() const OVERRIDE;
   virtual bool IsAltGrAvailable() const OVERRIDE;
@@ skipping 32 matching lines @@
   // The XKB layout name which we set last time like "us" and "us(dvorak)".
   std::string current_layout_name_;
 
   // A queue for executing setxkbmap one by one.
   std::queue<std::string> execute_queue_;
 
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<XKeyboardImpl> weak_factory_;
 
+  ObserverList<Observer> observers_;
+
   DISALLOW_COPY_AND_ASSIGN(XKeyboardImpl);
 };
 
 XKeyboardImpl::XKeyboardImpl()
     : is_running_on_chrome_os_(base::SysInfo::IsRunningOnChromeOS()),
       weak_factory_(this) {
   // X must be already initialized.
   CHECK(GetXDisplay());
 
   num_lock_mask_ = GetNumLockMask();
 
   if (is_running_on_chrome_os_) {
     // Some code seems to assume that Mod2Mask is always assigned to
     // Num Lock.
     //
     // TODO(yusukes): Check the assumption is really okay. If not,
     // modify the Aura code, and then remove the CHECK below.
     LOG_IF(ERROR, num_lock_mask_ != Mod2Mask)
         << "NumLock is not assigned to Mod2Mask.  : " << num_lock_mask_;
   }
 
   current_caps_lock_status_ = CapsLockIsEnabled();
 }
 
+void XKeyboardImpl::AddObserver(XKeyboard::Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void XKeyboardImpl::RemoveObserver(XKeyboard::Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 unsigned int XKeyboardImpl::GetNumLockMask() {
   DCHECK(thread_checker_.CalledOnValidThread());
   static const unsigned int kBadMask = 0;
 
   unsigned int real_mask = kBadMask;
   XkbDescPtr xkb_desc =
       XkbGetKeyboard(GetXDisplay(), XkbAllComponentsMask, XkbUseCoreKbd);
   if (!xkb_desc)
     return kBadMask;
 
@@ skipping 165 matching lines @@
   if (XkbSetAutoRepeatRate(GetXDisplay(), XkbUseCoreKbd,
                            rate.initial_delay_in_ms,
                            rate.repeat_interval_in_ms) != True) {
     DVLOG(1) << "Failed to set auto-repeat rate";
     return false;
   }
   return true;
 }
 
 void XKeyboardImpl::SetCapsLockEnabled(bool enable_caps_lock) {
+  if (current_caps_lock_status_ != enable_caps_lock)

[Daniel Erat, 2014/04/09 23:39:40]

add curly brackets since the statement is more than one line

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

Done.

+    FOR_EACH_OBSERVER(XKeyboard::Observer, observers_,
+                      OnCapsLockChanged(enable_caps_lock));
   SetLockedModifiers(enable_caps_lock);

[Daniel Erat, 2014/04/09 23:39:40]

you should probably update the state before you notify the observers that the
state has changed, right?

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

Done.

 }
 
 bool XKeyboardImpl::SetCurrentKeyboardLayoutByName(
     const std::string& layout_name) {
   if (SetLayoutInternal(layout_name, false)) {
     current_layout_name_ = layout_name;
     return true;
   }
   return false;
 }
@@ skipping 45 matching lines @@
   return CheckLayoutName(layout_name);
 }
 
 // static
 XKeyboard* XKeyboard::Create() {
   return new XKeyboardImpl();
 }
 
 }  // namespace input_method
 }  // namespace chromeos