chromeos: Make ash system tray directly observe IME state changes

ash/system/ime/tray_ime_chromeos.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/ime/tray_ime_chromeos.h"
 
 #include <memory>
 #include <vector>
 
 #include "ash/resources/vector_icons/vector_icons.h"
@@ skipping 11 matching lines @@
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ash/system/tray/tray_utils.h"
 #include "ash/system/tray/tri_view.h"
 #include "ash/system/tray_accessibility.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_node_data.h"
-#include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 108 matching lines @@
 TrayIME::TrayIME(SystemTray* system_tray)
     : SystemTrayItem(system_tray, UMA_IME),
       tray_label_(NULL),
       default_(NULL),
       detailed_(NULL),
       keyboard_suppressed_(false),
       is_visible_(true) {
   SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier();
   tray_notifier->AddVirtualKeyboardObserver(this);
   tray_notifier->AddAccessibilityObserver(this);
-  tray_notifier->AddIMEObserver(this);
+
+  // May be null in tests.
+  InputMethodManager* input_method_manager = InputMethodManager::Get();
+  if (input_method_manager) {
+    input_method_manager->AddObserver(this);
+    input_method_manager->AddImeMenuObserver(this);
+  }
+  ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
 }
 
 TrayIME::~TrayIME() {
+  ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
+  InputMethodManager* input_method_manager = InputMethodManager::Get();
+  if (input_method_manager) {
+    input_method_manager->RemoveImeMenuObserver(this);
+    input_method_manager->RemoveObserver(this);
+  }
+
   SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier();
-  tray_notifier->RemoveIMEObserver(this);
   tray_notifier->RemoveAccessibilityObserver(this);
   tray_notifier->RemoveVirtualKeyboardObserver(this);
 }
 
 void TrayIME::OnKeyboardSuppressionChanged(bool suppressed) {
   keyboard_suppressed_ = suppressed;
   Update();
 }
 
 void TrayIME::OnAccessibilityModeChanged(
@@ skipping 81 matching lines @@
 }
 
 void TrayIME::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayIME::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
-void TrayIME::OnIMERefresh() {
+void TrayIME::RefreshCurrentIme() {
   // Caches the current ime state.
   current_ime_ = ime_util::GetCurrentIME();
   ime_list_ = ime_util::GetAvailableIMEList();
   property_list_ = ime_util::GetCurrentIMEProperties();
   auto ime_state = InputMethodManager::Get()->GetActiveIMEState();
   ime_managed_message_ =
       ime_state->GetAllowedInputMethods().empty()
           ? base::string16()
           : l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY);
 
   Update();
 }
 
-void TrayIME::OnIMEMenuActivationChanged(bool is_active) {
+// InputMethodManager::Observer:
+void TrayIME::InputMethodChanged(InputMethodManager* manager,
+                                 Profile* profile,
+                                 bool show_message) {
+  RefreshCurrentIme();
+}
+
+// InputMethodMenuManager::Observer:
+void TrayIME::ImeMenuActivationChanged(bool is_active) {
   is_visible_ = !is_active;
   if (is_visible_)
-    OnIMERefresh();
+    RefreshCurrentIme();
   else
     Update();
 }
 
+void TrayIME::ImeMenuListChanged() {}
+
+void TrayIME::ImeMenuItemsChanged(
+    const std::string& engine_id,
+    const std::vector<InputMethodManager::MenuItem>& items) {}
+
+// ui::ime::InputMethodMenuManager::Observer:
+void TrayIME::InputMethodMenuItemChanged(
+    ui::ime::InputMethodMenuManager* manager) {
+  RefreshCurrentIme();
+}
+
 bool TrayIME::IsIMEManaged() {
   return !ime_managed_message_.empty();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ &&
          (ShouldShowImeTrayItem(ime_list_.size()) ||
           property_list_.size() > 1 || ShouldShowKeyboardToggle());
 }
 
 bool TrayIME::ShouldShowImeTrayItem(size_t ime_count) {
   // If managed, we want to show the tray icon even if there's only one input
   // method to choose from.
   size_t threshold = IsIMEManaged() ? 1 : 2;
   return ime_count >= threshold;
 }
 
 ImeListView::SingleImeBehavior TrayIME::GetSingleImeBehavior() {
   // If managed, we also want to show a single IME.
   return IsIMEManaged() ? ImeListView::SHOW_SINGLE_IME
                         : ImeListView::HIDE_SINGLE_IME;
 }
 
 }  // namespace ash