chromeos: Make ash system tray directly observe IME state changes

ash/system/ime_menu/ime_menu_tray.h

 // 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.
 
 #ifndef ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_
 #define ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_
 
 #include "ash/ash_export.h"
-#include "ash/system/ime/ime_observer.h"
 #include "ash/system/tray/ime_info.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.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"
 #include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
 namespace views {
 class Label;
 }  // namespace views
 
 namespace ash {
 class ImeListView;
 
 // A button in the tray which displays the short name of the currently-activated
 // IME (e.g., 'GB', 'US'). Clicking this button opens the opt-in IME menu,
 // a standalone bubble displaying a list of available IMEs along with buttons
 // for emoji, handwriting, and voice.
-class ASH_EXPORT ImeMenuTray : public TrayBackgroundView,
-                               public IMEObserver,
-                               public views::TrayBubbleView::Delegate,
-                               public keyboard::KeyboardControllerObserver,
-                               public VirtualKeyboardObserver {
+class ASH_EXPORT ImeMenuTray
+    : public TrayBackgroundView,
+      public views::TrayBubbleView::Delegate,
+      public keyboard::KeyboardControllerObserver,
+      public VirtualKeyboardObserver,
+      public chromeos::input_method::InputMethodManager::Observer,
+      public chromeos::input_method::InputMethodManager::ImeMenuObserver,
+      public ui::ime::InputMethodMenuManager::Observer {
  public:
   explicit ImeMenuTray(Shelf* shelf);
   ~ImeMenuTray() override;
 
   // Shows the IME menu bubble and highlights the button.
   void ShowImeMenuBubble();
 
   // Hides the IME menu bubble and lowlights the button.
   void HideImeMenuBubble();
 
@@ skipping 12 matching lines @@
   // Returns whether the virtual keyboard toggle should be shown in shown in the
   // opt-in IME menu.
   bool ShouldShowKeyboardToggle() const;
 
   // TrayBackgroundView:
   base::string16 GetAccessibleNameForTray() override;
   void HideBubbleWithView(const views::TrayBubbleView* bubble_view) override;
   void ClickedOutsideBubble() override;
   bool PerformAction(const ui::Event& event) override;
 
-  // IMEObserver:
-  void OnIMERefresh() override;
-  void OnIMEMenuActivationChanged(bool is_activated) 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;
 
   // views::TrayBubbleView::Delegate:
   void BubbleViewDestroyed() override;
   void OnMouseEnteredView() override;
   void OnMouseExitedView() override;
   base::string16 GetAccessibleNameForBubble() override;
   void HideBubble(const views::TrayBubbleView* bubble_view) override;
 
   // keyboard::KeyboardControllerObserver:
   void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
@@ skipping 28 matching lines @@
   bool show_bubble_after_keyboard_hidden_;
 
   base::WeakPtrFactory<ImeMenuTray> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ImeMenuTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_IME_MENU_IME_MENU_TRAY_H_