Revert 251164 "Split out InputMethodMenuManager from InputMethod..."

trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

 // Copyright 2013 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 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"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/callback_list.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/login/login_state.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 
 namespace chromeos {
 
 class SystemTrayDelegateChromeOS
-    : public ash::ime::InputMethodMenuManager::Observer,
-      public ash::SystemTrayDelegate,
+    : public ash::SystemTrayDelegate,
       public SessionManagerClient::Observer,
       public drive::JobListObserver,
       public content::NotificationObserver,
       public input_method::InputMethodManager::Observer,
       public chromeos::LoginState::Observer,
       public device::BluetoothAdapter::Observer,
       public SystemKeyEventListener::CapsLockObserver,
       public policy::CloudPolicyStore::Observer,
       public ash::SessionStateObserver {
  public:
@@ skipping 129 matching lines @@
 
   void OnAccessibilityModeChanged(
       ash::AccessibilityNotificationVisibility notify);
 
   void UpdatePerformanceTracing();
 
   // Overridden from InputMethodManager::Observer.
   virtual void InputMethodChanged(input_method::InputMethodManager* manager,
                                   bool show_message) OVERRIDE;
 
-  // Overridden from InputMethodMenuManager::Observer.
-  virtual void InputMethodMenuItemChanged(
-      ash::ime::InputMethodMenuManager* manager) OVERRIDE;
+  virtual void InputMethodPropertyChanged(
+      input_method::InputMethodManager* manager) OVERRIDE;
 
   // drive::JobListObserver overrides.
   virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE;
 
   virtual void OnJobDone(const drive::JobInfo& job_info,
                          drive::FileError error) OVERRIDE;
 
   virtual void OnJobUpdated(const drive::JobInfo& job_info) OVERRIDE;
 
   drive::DriveIntegrationService* FindDriveIntegrationService();
@@ skipping 41 matching lines @@
   scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
   scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
 };
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
 
 }  // namespace chromeos
 #endif  // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_