Moves CandidateWindow model to ui/base/ime (2nd)

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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_view.h"
 #include "chrome/browser/chromeos/input_method/infolist_window.h"
 #include "chrome/browser/chromeos/input_method/mode_indicator_controller.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
-
 namespace chromeos {
 namespace input_method {
 
 namespace {
 
 }  // namespace
 
 CandidateWindowControllerImpl::CandidateWindowControllerImpl()
     : candidate_window_view_(NULL),
       infolist_window_(NULL) {
@@ skipping 61 matching lines @@
   // Mode indicator controller also needs the cursor bounds.
   mode_indicator_controller_->SetCursorBounds(cursor_bounds);
 }
 
 void CandidateWindowControllerImpl::FocusStateChanged(bool is_focused) {
   mode_indicator_controller_->FocusStateChanged(is_focused);
 }
 
 // static
 void CandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
-    const CandidateWindow& candidate_window,
+    const ui::CandidateWindow& candidate_window,
     std::vector<InfolistEntry>* infolist_entries,
     bool* has_highlighted) {
   DCHECK(infolist_entries);
   DCHECK(has_highlighted);
   infolist_entries->clear();
   *has_highlighted = false;
 
   const size_t cursor_index_in_page =
       candidate_window.cursor_position() % candidate_window.page_size();
 
   for (size_t i = 0; i < candidate_window.candidates().size(); ++i) {
-    const CandidateWindow::Entry& ibus_entry =
+    const ui::CandidateWindow::Entry& ibus_entry =
         candidate_window.candidates()[i];
     if (ibus_entry.description_title.empty() &&
         ibus_entry.description_body.empty())
       continue;
     InfolistEntry entry(base::UTF8ToUTF16(ibus_entry.description_title),
                         base::UTF8ToUTF16(ibus_entry.description_body));
     if (i == cursor_index_in_page) {
       entry.highlighted = true;
       *has_highlighted = true;
     }
     infolist_entries->push_back(entry);
   }
 }
 
 void CandidateWindowControllerImpl::UpdateLookupTable(
-    const CandidateWindow& candidate_window,
+    const ui::CandidateWindow& candidate_window,
     bool visible) {
   // If it's not visible, hide the lookup table and return.
   if (!visible) {
     if (candidate_window_view_)
       candidate_window_view_->HideLookupTable();
     if (infolist_window_)
       infolist_window_->HideImmediately();
     // TODO(nona): Introduce unittests for crbug.com/170036.
     latest_infolist_entries_.clear();
     return;
@@ skipping 77 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void CandidateWindowControllerImpl::RemoveObserver(
     CandidateWindowController::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace input_method
 }  // namespace chromeos