chromeos: Make ash system tray directly observe IME state changes

ash/system/ime_menu/ime_menu_tray.cc

 // Copyright 2016 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_menu/ime_menu_tray.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_constants.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/ime/ime_util.h"
 #include "ash/system/ime_menu/ime_list_view.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_container.h"
 #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 "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/session_manager/session_manager_types.h"
-#include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/ime/ime_bridge.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/range/range.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
@@ skipping 245 matching lines @@
       show_keyboard_(false),
       force_show_keyboard_(false),
       keyboard_suppressed_(false),
       show_bubble_after_keyboard_hidden_(false),
       weak_ptr_factory_(this) {
   SetInkDropMode(InkDropMode::ON);
   SetupLabelForTray(label_);
   label_->SetElideBehavior(gfx::TRUNCATE);
   tray_container()->AddChildView(label_);
   SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier();
-  tray_notifier->AddIMEObserver(this);
   tray_notifier->AddVirtualKeyboardObserver(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);
 }
 
 ImeMenuTray::~ImeMenuTray() {
   if (bubble_)
     bubble_->bubble_view()->reset_delegate();
+  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->RemoveVirtualKeyboardObserver(this);
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->RemoveObserver(this);
 }
 
 void ImeMenuTray::ShowImeMenuBubble() {
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
@@ skipping 121 matching lines @@
 }
 
 bool ImeMenuTray::PerformAction(const ui::Event& event) {
   if (bubble_)
     HideImeMenuBubble();
   else
     ShowImeMenuBubble();
   return true;
 }
 
-void ImeMenuTray::OnIMERefresh() {
+void ImeMenuTray::RefreshCurrentIme() {
   UpdateTrayLabel();
   if (bubble_ && ime_list_view_) {
     IMEInfoList list = ime_util::GetAvailableIMEList();
     IMEPropertyInfoList property_list = ime_util::GetCurrentIMEProperties();
     ime_list_view_->Update(list, property_list, false,
                            ImeListView::SHOW_SINGLE_IME);
   }
 }
 
-void ImeMenuTray::OnIMEMenuActivationChanged(bool is_activated) {
+// InputMethodManager::Observer:
+void ImeMenuTray::InputMethodChanged(InputMethodManager* manager,
+                                     Profile* profile,
+                                     bool show_message) {
+  RefreshCurrentIme();
+}
+
+// InputMethodMenuManager::Observer:
+void ImeMenuTray::ImeMenuActivationChanged(bool is_activated) {
   SetVisible(is_activated);
   if (is_activated)
     UpdateTrayLabel();
   else
     HideImeMenuBubble();
 }
 
-void ImeMenuTray::BubbleViewDestroyed() {
+void ImeMenuTray::ImeMenuListChanged() {}
+
+void ImeMenuTray::ImeMenuItemsChanged(
+    const std::string& engine_id,
+    const std::vector<InputMethodManager::MenuItem>& items) {}
+
+// ui::ime::InputMethodMenuManager::Observer:
+void ImeMenuTray::InputMethodMenuItemChanged(
+    ui::ime::InputMethodMenuManager* manager) {
+  RefreshCurrentIme();
 }
 
+void ImeMenuTray::BubbleViewDestroyed() {}
+
 void ImeMenuTray::OnMouseEnteredView() {}
 
 void ImeMenuTray::OnMouseExitedView() {}
 
 base::string16 ImeMenuTray::GetAccessibleNameForBubble() {
   return l10n_util::GetStringUTF16(IDS_ASH_IME_MENU_ACCESSIBLE_NAME);
 }
 
 void ImeMenuTray::HideBubble(const views::TrayBubbleView* bubble_view) {
   HideBubbleWithView(bubble_view);
@@ skipping 65 matching lines @@
   else
     label_->SetText(current_ime_.short_name);
 }
 
 void ImeMenuTray::DisableVirtualKeyboard() {
   Shell::Get()->accessibility_delegate()->SetVirtualKeyboardEnabled(false);
   force_show_keyboard_ = false;
 }
 
 }  // namespace ash