Update IME preferences outside the IME status button when Uber Tray is in use.

chrome/browser/chromeos/input_method/input_method_manager.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 "chrome/browser/chromeos/input_method/input_method_manager.h"
 
 #include <algorithm>
 
 #include <glib.h>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/input_method/browser_state_monitor.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ skipping 47 matching lines @@
       : ibus_controller_(IBusController::Create()),
         should_hide_properties_(true),
         should_launch_ime_(false),
         ime_connected_(false),
         enable_auto_ime_shutdown_(false),  // workaround for crosbug.com/27051.
         enable_extension_imes_(true),
         shutting_down_(false),
         ibus_daemon_process_handle_(base::kNullProcessHandle),
         util_(whitelist_.GetSupportedInputMethods()),
         xkeyboard_(XKeyboard::Create(util_)),
+        ALLOW_THIS_IN_INITIALIZER_LIST(
+            browser_state_monitor_(new BrowserStateMonitor(this))),
         ignore_hotkeys_(false) {
     // Observe APP_TERMINATING to stop input method daemon gracefully.
     // We should not use APP_EXITING here since logout might be canceled by
     // JavaScript after APP_EXITING is sent (crosbug.com/11055).
     // Note that even if we fail to stop input method daemon from
     // Chrome in case of a sudden crash, we have a way to do it from an
     // upstart script. See crosbug.com/6515 and crosbug.com/6995 for
     // details.
     notification_registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
                                 content::NotificationService::AllSources());
@@ skipping 1107 matching lines @@
     // Stop the input method daemon on browser shutdown.
     if (type == content::NOTIFICATION_APP_TERMINATING) {
       shutting_down_ = true;
       notification_registrar_.RemoveAll();
       StopInputMethodDaemon();
 #if !defined(USE_VIRTUAL_KEYBOARD)
       if (candidate_window_controller_.get())
         candidate_window_controller_->RemoveObserver(this);
       candidate_window_controller_.reset(NULL);
 #endif
+      // |browser_state_monitor_| has to be destructed while the PrefService
+      // object associated with the monitor is alive. (crbug.com/120183)
+      browser_state_monitor_.reset();
     }
   }
 
   // The IBus controller is used to control the input method status and
   // allow allow callbacks when the input method status changes.
   scoped_ptr<IBusController> ibus_controller_;
   ObserverList<InputMethodManager::Observer> observers_;
   ObserverList<InputMethodManager::CandidateWindowObserver>
       candidate_window_observers_;
   ObserverList<PreferenceObserver> pre_login_preference_observers_;
@@ skipping 67 matching lines @@
   InputMethodWhitelist whitelist_;
 
   // An object which provides miscellaneous input method utility functions. Note
   // that |util_| is required to initialize |xkeyboard_|.
   InputMethodUtil util_;
 
   // An object for switching XKB layouts and keyboard status like caps lock and
   // auto-repeat interval.
   scoped_ptr<XKeyboard> xkeyboard_;
 
+  // An object which monitors a notification from the browser to keep track of
+  // the browser state (not logged in, logged in, etc.).
+  scoped_ptr<BrowserStateMonitor> browser_state_monitor_;
+
   // true when DisableHotkeys() is called to temporarily disable IME hotkeys.
   // EnableHotkeys() resets the flag to the default value, false.
   bool ignore_hotkeys_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
 };
 
 // static
 InputMethodManager* InputMethodManager::GetInstance() {
   return InputMethodManagerImpl::GetInstance();
 }
 
 }  // namespace input_method
 }  // namespace chromeos