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

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

 // 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.
 
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/ime/input_method_menu_item.h"
-#include "ash/ime/input_method_menu_manager.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/session_state_delegate.h"
 #include "ash/session_state_observer.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/date/clock_observer.h"
 #include "ash/system/drive/drive_observer.h"
 #include "ash/system/ime/ime_observer.h"
@@ skipping 266 matching lines @@
   registrar_->Add(
       this,
       chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD,
       content::NotificationService::AllSources());
 }
 
 void SystemTrayDelegateChromeOS::Initialize() {
   DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
   input_method::InputMethodManager::Get()->AddObserver(this);
-  ash::ime::InputMethodMenuManager::Get()->AddObserver(this);
   UpdateClockType();
 
   if (SystemKeyEventListener::GetInstance())
     SystemKeyEventListener::GetInstance()->AddCapsLockObserver(this);
 
   device::BluetoothAdapterFactory::GetAdapter(
       base::Bind(&SystemTrayDelegateChromeOS::InitializeOnAdapterReady,
                  weak_ptr_factory_.GetWeakPtr()));
 
   ash::Shell::GetInstance()->session_state_delegate()->AddSessionStateObserver(
@@ skipping 40 matching lines @@
 SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {
   // Unregister PrefChangeRegistrars.
   local_state_registrar_.reset();
   user_pref_registrar_.reset();
 
   // Unregister content notifications befure destroying any components.
   registrar_.reset();
 
   DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
   input_method::InputMethodManager::Get()->RemoveObserver(this);
-  ash::ime::InputMethodMenuManager::Get()->RemoveObserver(this);
   if (SystemKeyEventListener::GetInstance())
     SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this);
   bluetooth_adapter_->RemoveObserver(this);
   ash::Shell::GetInstance()
       ->session_state_delegate()
       ->RemoveSessionStateObserver(this);
   LoginState::Get()->RemoveObserver(this);
 
   // Stop observing Drive operations.
   UnobserveDriveUpdates();
@@ skipping 389 matching lines @@
     input_method::InputMethodDescriptor& ime = ime_descriptors->at(i);
     ash::IMEInfo info;
     ExtractIMEInfo(ime, *util, &info);
     info.selected = ime.id() == current;
     list->push_back(info);
   }
 }
 
 void SystemTrayDelegateChromeOS::GetCurrentIMEProperties(
     ash::IMEPropertyInfoList* list) {
-  ash::ime::InputMethodMenuItemList menu_list =
-      ash::ime::InputMethodMenuManager::Get()->
-      GetCurrentInputMethodMenuItemList();
-  for (size_t i = 0; i < menu_list.size(); ++i) {
+  input_method::InputMethodManager* manager =
+      input_method::InputMethodManager::Get();
+  input_method::InputMethodPropertyList properties =
+      manager->GetCurrentInputMethodProperties();
+  for (size_t i = 0; i < properties.size(); ++i) {
     ash::IMEPropertyInfo property;
-    property.key = menu_list[i].key;
-    property.name = base::UTF8ToUTF16(menu_list[i].label);
-    property.selected = menu_list[i].is_selection_item_checked;
+    property.key = properties[i].key;
+    property.name = base::UTF8ToUTF16(properties[i].label);
+    property.selected = properties[i].is_selection_item_checked;
     list->push_back(property);
   }
 }
 
 void SystemTrayDelegateChromeOS::SwitchIME(const std::string& ime_id) {
   input_method::InputMethodManager::Get()->ChangeInputMethod(ime_id);
 }
 
 void SystemTrayDelegateChromeOS::ActivateIMEProperty(const std::string& key) {
-  input_method::InputMethodManager::Get()->ActivateInputMethodMenuItem(key);
+  input_method::InputMethodManager::Get()->ActivateInputMethodProperty(key);
 }
 
 void SystemTrayDelegateChromeOS::CancelDriveOperation(int32 operation_id) {
   DriveIntegrationService* integration_service = FindDriveIntegrationService();
   if (!integration_service)
     return;
 
   integration_service->job_list()->CancelJob(operation_id);
 }
 
@@ skipping 396 matching lines @@
   // |show_message| in ash means the message_center notifications
   // which should not be shown unless kDisableIMEModeIndicator is
   // on, since the mode indicator already notifies the user.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDisableIMEModeIndicator)) {
     show_message = false;
   }
   GetSystemTrayNotifier()->NotifyRefreshIME(show_message);
 }
 
-// Overridden from InputMethodMenuManager::Observer.
-void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged(
-    ash::ime::InputMethodMenuManager* manager) {
+void SystemTrayDelegateChromeOS::InputMethodPropertyChanged(
+    input_method::InputMethodManager* manager) {
   GetSystemTrayNotifier()->NotifyRefreshIME(false);
 }
 
 // drive::JobListObserver overrides.
 void SystemTrayDelegateChromeOS::OnJobAdded(const drive::JobInfo& job_info) {
   OnJobUpdated(job_info);
 }
 
 void SystemTrayDelegateChromeOS::OnJobDone(const drive::JobInfo& job_info,
                                            drive::FileError error) {
@@ skipping 85 matching lines @@
 void SystemTrayDelegateChromeOS::UserAddedToSession(
     const std::string& user_id) {
   GetSystemTrayNotifier()->NotifyUserAddedToSession();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos