Move ash/ime to ui/chromeos/ime

chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc

 // Copyright (c) 2012 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/chromeos/input_method/candidate_window_controller_impl.h"
 
 #include <string>
 #include <vector>
 
-#include "ash/ime/infolist_window.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h"
+#include "ui/chromeos/ime/infolist_window.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 namespace input_method {
 
 namespace {
 
 }  // namespace
 
@@ skipping 13 matching lines @@
     candidate_window_view_->GetWidget()->RemoveObserver(this);
   }
 }
 
 void CandidateWindowControllerImpl::InitCandidateWindowView() {
   if (candidate_window_view_)
     return;
 
   aura::Window* active_window = ash::wm::GetActiveWindow();
   candidate_window_view_ =
-      new ash::ime::CandidateWindowView(ash::Shell::GetContainer(
+      new ui::ime::CandidateWindowView(ash::Shell::GetContainer(
           active_window ? active_window->GetRootWindow()
                         : ash::Shell::GetTargetRootWindow(),
           ash::kShellWindowId_SettingBubbleContainer));
   candidate_window_view_->AddObserver(this);
   candidate_window_view_->SetCursorBounds(cursor_bounds_, composition_head_);
   views::Widget* widget = candidate_window_view_->InitWidget();
   widget->AddObserver(this);
   widget->Show();
   FOR_EACH_OBSERVER(CandidateWindowController::Observer, observers_,
                     CandidateWindowOpened());
@@ skipping 76 matching lines @@
   // Highlight moves out of the infolist entries.
   if (!has_highlighted) {
     if (infolist_window_)
       infolist_window_->HideWithDelay();
     return;
   }
 
   if (infolist_window_) {
     infolist_window_->Relayout(infolist_entries);
   } else {
-    infolist_window_ = new ash::ime::InfolistWindow(
+    infolist_window_ = new ui::ime::InfolistWindow(
         candidate_window_view_, infolist_entries);
     infolist_window_->InitWidget();
     infolist_window_->GetWidget()->AddObserver(this);
   }
   infolist_window_->ShowWithDelay();
 }
 
 void CandidateWindowControllerImpl::UpdatePreeditText(
     const base::string16& text, unsigned int cursor, bool visible) {
   // If it's not visible, hide the preedit text and return.
@@ skipping 32 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void CandidateWindowControllerImpl::RemoveObserver(
     CandidateWindowController::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace input_method
 }  // namespace chromeos