chromeos: Make ash system tray directly observe IME state changes

ash/system/ime/tray_ime_chromeos.h

 // Copyright 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.
 
 #ifndef ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
 #define ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_
 
 #include <stddef.h>
 
 #include "ash/system/accessibility_observer.h"
-#include "ash/system/ime/ime_observer.h"
 #include "ash/system/ime_menu/ime_list_view.h"
 #include "ash/system/tray/ime_info.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/virtual_keyboard/virtual_keyboard_observer.h"
 #include "base/macros.h"
+#include "ui/base/ime/chromeos/input_method_manager.h"
+#include "ui/chromeos/ime/input_method_menu_manager.h"
 
 namespace ash {
 
 namespace tray {
 class IMEDefaultView;
 class IMEDetailedView;
 }
 
 class TrayItemView;
 
 // Controller for IME options in the system menu. Note this is separate from
 // the "opt-in" IME menu which can appear as a button in the system tray
 // area; that is controlled by ImeMenuTray.
-class ASH_EXPORT TrayIME : public SystemTrayItem,
-                           public IMEObserver,
-                           public AccessibilityObserver,
-                           public VirtualKeyboardObserver {
+class ASH_EXPORT TrayIME
+    : public SystemTrayItem,
+      public AccessibilityObserver,
+      public VirtualKeyboardObserver,
+      public chromeos::input_method::InputMethodManager::Observer,
+      public chromeos::input_method::InputMethodManager::ImeMenuObserver,
+      public ui::ime::InputMethodMenuManager::Observer {
  public:
   explicit TrayIME(SystemTray* system_tray);
   ~TrayIME() override;
 
   // Overridden from VirtualKeyboardObserver.
   void OnKeyboardSuppressionChanged(bool suppressed) override;
 
   // Overridden from AccessibilityObserver:
   void OnAccessibilityModeChanged(
       AccessibilityNotificationVisibility notify) override;
@@ skipping 12 matching lines @@
   base::string16 GetDefaultViewLabel(bool show_ime_label);
 
   // Overridden from SystemTrayItem.
   views::View* CreateTrayView(LoginStatus status) override;
   views::View* CreateDefaultView(LoginStatus status) override;
   views::View* CreateDetailedView(LoginStatus status) override;
   void DestroyTrayView() override;
   void DestroyDefaultView() override;
   void DestroyDetailedView() override;
 
-  // Overridden from IMEObserver.
-  void OnIMERefresh() override;
-  void OnIMEMenuActivationChanged(bool is_active) override;
+  void RefreshCurrentIme();
+
+  // chromeos::input_method::InputMethodManager::Observer:
+  void InputMethodChanged(chromeos::input_method::InputMethodManager* manager,
+                          Profile* profile,
+                          bool show_message) override;
+
+  // chromeos::input_method::InputMethodManager::ImeMenuObserver:
+  void ImeMenuActivationChanged(bool is_active) override;
+  void ImeMenuListChanged() override;
+  void ImeMenuItemsChanged(
+      const std::string& engine_id,
+      const std::vector<chromeos::input_method::InputMethodManager::MenuItem>&
+          items) override;
+
+  // ui::ime::InputMethodMenuManager::Observer:
+  void InputMethodMenuItemChanged(
+      ui::ime::InputMethodMenuManager* manager) override;
 
   // Returns true input methods are managed by policy.
   bool IsIMEManaged();
 
   // Whether the default view should be shown.
   bool ShouldDefaultViewBeVisible();
 
   // Decides if a tray icon should be shown.
   bool ShouldShowImeTrayItem(size_t ime_count);
+
   // Mandates behavior for the single IME case for the detailed IME list
   // sub-view.
   ImeListView::SingleImeBehavior GetSingleImeBehavior();
 
   TrayItemView* tray_label_;
   tray::IMEDefaultView* default_;
   tray::IMEDetailedView* detailed_;
   // Whether the virtual keyboard is suppressed.
   bool keyboard_suppressed_;
   // Cached IME info.
   IMEInfoList ime_list_;
   IMEInfo current_ime_;
   IMEPropertyInfoList property_list_;
   // If non-empty, a controlled-setting icon should be displayed with a tooltip
   // text defined by this string.
   base::string16 ime_managed_message_;
 
   // Whether the IME label and tray items should be visible.
   bool is_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayIME);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_IME_TRAY_IME_CHROMEOS_H_