Move ash/ime to ui/chromeos/ime

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/session_state_delegate.h"
 #include "ash/session/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/chromeos/session/logout_button_observer.h"
 #include "ash/system/date/clock_observer.h"
 #include "ash/system/ime/ime_observer.h"
@@ skipping 79 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "net/base/escape.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
+#include "ui/chromeos/ime/input_method_menu_item.h"
+#include "ui/chromeos/ime/input_method_menu_manager.h"
 
 namespace chromeos {
 
 namespace {
 
 // The minimum session length limit that can be set.
 const int kSessionLengthLimitMinMs = 30 * 1000;  // 30 seconds.
 
 // The maximum session length limit that can be set.
 const int kSessionLengthLimitMaxMs = 24 * 60 * 60 * 1000;  // 24 hours.
@@ skipping 101 matching lines @@
       base::Bind(&SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged,
                  base::Unretained(this)));
 
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
 }
 
 void SystemTrayDelegateChromeOS::Initialize() {
   DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
   input_method::InputMethodManager::Get()->AddObserver(this);
-  ash::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
+  ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
   UpdateClockType();
 
   device::BluetoothAdapterFactory::GetAdapter(
       base::Bind(&SystemTrayDelegateChromeOS::InitializeOnAdapterReady,
                  weak_ptr_factory_.GetWeakPtr()));
 
   ash::Shell::GetInstance()->session_state_delegate()->AddSessionStateObserver(
       this);
 
   if (LoginState::IsInitialized())
@@ skipping 45 matching lines @@
   user_pref_registrar_.reset();
 
   // Unregister content notifications before destroying any components.
   registrar_.reset();
 
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
   DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
   input_method::InputMethodManager::Get()->RemoveObserver(this);
-  ash::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
+  ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
   bluetooth_adapter_->RemoveObserver(this);
   ash::Shell::GetInstance()
       ->session_state_delegate()
       ->RemoveSessionStateObserver(this);
   LoginState::Get()->RemoveObserver(this);
 
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->RemoveAudioObserver(this);
 
   BrowserList::RemoveObserver(this);
@@ skipping 409 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::GetInstance()->
+  ui::ime::InputMethodMenuItemList menu_list =
+      ui::ime::InputMethodMenuManager::GetInstance()->
       GetCurrentInputMethodMenuItemList();
   for (size_t i = 0; i < menu_list.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;
     list->push_back(property);
   }
 }
 
@@ skipping 431 matching lines @@
 
 // Overridden from InputMethodManager::Observer.
 void SystemTrayDelegateChromeOS::InputMethodChanged(
     input_method::InputMethodManager* manager,
     bool show_message) {
   GetSystemTrayNotifier()->NotifyRefreshIME();
 }
 
 // Overridden from InputMethodMenuManager::Observer.
 void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged(
-    ash::ime::InputMethodMenuManager* manager) {
+    ui::ime::InputMethodMenuManager* manager) {
   GetSystemTrayNotifier()->NotifyRefreshIME();
 }
 
 // Overridden from CrasAudioHandler::AudioObserver.
 void SystemTrayDelegateChromeOS::OnOutputVolumeChanged() {
   GetSystemTrayNotifier()->NotifyAudioOutputVolumeChanged();
 }
 
 void SystemTrayDelegateChromeOS::OnOutputMuteChanged() {
   GetSystemTrayNotifier()->NotifyAudioOutputMuteChanged();
@@ skipping 115 matching lines @@
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos