chromeos: Make ash system tray directly observe IME state changes

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index 7612376dd93c247862dda2456951724565992bfc..6b83f802f7c482430f1b1d4cc15d6bb704694512 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -17,7 +17,6 @@
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/date/clock_observer.h"
-#include "ash/system/ime/ime_observer.h"
 #include "ash/system/power/power_status.h"
 #include "ash/system/session/logout_button_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
@@ -56,9 +55,7 @@
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
-#include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/chromeos/events/pref_names.h"
-#include "ui/chromeos/ime/input_method_menu_manager.h"
 
 namespace chromeos {
 
@@ -105,10 +102,6 @@ SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
 }
 
 void SystemTrayDelegateChromeOS::Initialize() {
-  input_method::InputMethodManager::Get()->AddObserver(this);
-  input_method::InputMethodManager::Get()->AddImeMenuObserver(this);
-  ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
-
   BrowserList::AddObserver(this);
 
   local_state_registrar_.reset(new PrefChangeRegistrar);
@@ -138,9 +131,6 @@ SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
-  input_method::InputMethodManager::Get()->RemoveObserver(this);
-  ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
-
   BrowserList::RemoveObserver(this);
   StopObservingAppWindowRegistry();
 }
@@ -398,20 +388,6 @@ void SystemTrayDelegateChromeOS::UpdatePerformanceTracing() {
   GetSystemTrayNotifier()->NotifyTracingModeChanged(value);
 }
 
-// Overridden from InputMethodManager::Observer.
-void SystemTrayDelegateChromeOS::InputMethodChanged(
-    input_method::InputMethodManager* manager,
-    Profile* /* profile */,
-    bool show_message) {
-  GetSystemTrayNotifier()->NotifyRefreshIME();
-}
-
-// Overridden from InputMethodMenuManager::Observer.
-void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged(
-    ui::ime::InputMethodMenuManager* manager) {
-  GetSystemTrayNotifier()->NotifyRefreshIME();
-}
-
 // Overridden from chrome::BrowserListObserver.
 void SystemTrayDelegateChromeOS::OnBrowserRemoved(Browser* browser) {
   NotifyIfLastWindowClosed();
@@ -431,16 +407,6 @@ void SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged(
     OnAccessibilityModeChanged(details.notify);
 }
 
-void SystemTrayDelegateChromeOS::ImeMenuActivationChanged(bool is_active) {
-  GetSystemTrayNotifier()->NotifyRefreshIMEMenu(is_active);
-}
-
-void SystemTrayDelegateChromeOS::ImeMenuListChanged() {}
-
-void SystemTrayDelegateChromeOS::ImeMenuItemsChanged(
-    const std::string& engine_id,
-    const std::vector<input_method::InputMethodManager::MenuItem>& items) {}
-
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }