Pass a correct input method descriptor to the ActiveInputMethodsChanged function.

chrome/browser/chromeos/cros/input_method_library.cc

 // Copyright (c) 2010 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/cros/input_method_library.h"
 
 #include <glib.h>
 #include <signal.h>
 
 #include "unicode/uloc.h"
@@ skipping 309 matching lines @@
 
     if (pending_config_requests_.empty()) {
       timer_.Stop();  // no-op if it's not running.
     } else if (!timer_.IsRunning()) {
       // Flush is not completed. Start a timer if it's not yet running.
       static const int64 kTimerIntervalInMsec = 100;
       timer_.Start(base::TimeDelta::FromMilliseconds(kTimerIntervalInMsec),
                    this, &InputMethodLibraryImpl::FlushImeConfig);
     }
 
+    // Notify the current input method and the number of active input methods to
+    // the UI so that the UI could determine e.g. if it should show/hide the
+    // input method indicator, etc. We have to call FOR_EACH_OBSERVER here since
+    // updating "preload_engine" does not necessarily trigger a DBus signal such
+    // as "global-engine-changed". For example,
+    // 1) If we change the preload_engine from "xkb:us:intl:eng" (i.e. the
+    //    indicator is hidden) to "xkb:us:intl:eng,mozc", we have to update UI
+    //    so it shows the indicator, but no signal is sent from ibus-daemon
+    //    because the current input method is not changed.
+    // 2) If we change the preload_engine from "xkb:us::eng,mozc" (i.e. the
+    //    indicator is shown and ibus-daemon is started) to "xkb:us::eng", we
+    //    have to update UI so it hides the indicator, but we should not expect
+    //    that ibus-daemon could send a DBus signal since the daemon is killed
+    //    right after this FlushImeConfig() call.
     if (active_input_methods_are_changed) {
+      scoped_ptr<InputMethodDescriptor> current_input_method(
+          chromeos::GetCurrentInputMethod(input_method_status_connection_));
+      // The |current_input_method_| member variable should not be used since
+      // the variable might be stale. SetImeConfig("preload_engine") call above
+      // might change the current input method in ibus-daemon, but the variable
+      // is not updated until InputMethodChangedHandler(), which is the handler
+      // for the global-engine-changed DBus signal, is called.
       const size_t num_active_input_methods = GetNumActiveInputMethods();
-      FOR_EACH_OBSERVER(Observer, observers_,
-                        ActiveInputMethodsChanged(this,
-                                                  current_input_method_,
-                                                  num_active_input_methods));
+      if (current_input_method.get()) {
+        FOR_EACH_OBSERVER(Observer, observers_,
+                          ActiveInputMethodsChanged(this,
+                                                    *current_input_method.get(),
+                                                    num_active_input_methods));
+      }
     }
   }
 
   static void InputMethodChangedHandler(
       void* object,
       const chromeos::InputMethodDescriptor& current_input_method) {
     // The handler is called when the input method method change is
     // notified via a DBus connection. Since the DBus notificatiosn are
     // handled in the UI thread, we can assume that this function always
     // runs on the UI thread, but just in case.
@@ skipping 501 matching lines @@
     return new InputMethodLibraryStubImpl();
   else
     return new InputMethodLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::InputMethodLibraryImpl);