Reland of: Split out InputMethodMenuManager from InputMethodManager.

chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index 4d2a383d569fcfe07cb7361562bf029a4791d9a8..893d59b18ff35b7f8bd9e470d32319c2a2654052 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 
+#include "ash/ime/input_method_menu_manager.h"
 #include "ash/session_state_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ -30,7 +31,8 @@
 namespace chromeos {
 
 class SystemTrayDelegateChromeOS
-    : public ash::SystemTrayDelegate,
+    : public ash::ime::InputMethodMenuManager::Observer,
+      public ash::SystemTrayDelegate,
       public SessionManagerClient::Observer,
       public drive::JobListObserver,
       public content::NotificationObserver,
@@ -180,8 +182,9 @@ class SystemTrayDelegateChromeOS
   virtual void InputMethodChanged(input_method::InputMethodManager* manager,
                                   bool show_message) OVERRIDE;
 
-  virtual void InputMethodPropertyChanged(
-      input_method::InputMethodManager* manager) OVERRIDE;
+  // Overridden from InputMethodMenuManager::Observer.
+  virtual void InputMethodMenuItemChanged(
+      ash::ime::InputMethodMenuManager* manager) OVERRIDE;
 
   // drive::JobListObserver overrides.
   virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE;