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

chrome/browser/chromeos/input_method/candidate_window_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_
 
-#include "chromeos/ime/candidate_window.h"
+#include "ui/base/ime/candidate_window.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
 
 namespace chromeos {
 namespace input_method {
 
 class CandidateView;
 class InformationTextArea;
 
 // CandidateWindowView is the main container of the candidate window UI.
@@ skipping 38 matching lines @@
   void ShowAuxiliaryText();
 
   // Shows the preedit text.
   void ShowPreeditText();
 
   // Updates the preedit text.
   void UpdatePreeditText(const std::string& utf8_text);
 
   // Updates candidates of the candidate window from |candidate_window|.
   // Candidates are arranged per |orientation|.
-  void UpdateCandidates(const CandidateWindow& candidate_window);
+  void UpdateCandidates(const ui::CandidateWindow& candidate_window);
 
   void SetCursorBounds(const gfx::Rect& cursor_bounds,
                        const gfx::Rect& composition_head);
 
  private:
   friend class CandidateWindowViewTest;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   void SelectCandidateAt(int index_in_page);
   void UpdateVisibility();
 
   // Initializes the candidate views if needed.
-  void MaybeInitializeCandidateViews(const CandidateWindow& candidate_window);
+  void MaybeInitializeCandidateViews(
+      const ui::CandidateWindow& candidate_window);
 
   // The candidate window data model.
-  CandidateWindow candidate_window_;
+  ui::CandidateWindow candidate_window_;
 
   // The index in the current page of the candidate currently being selected.
   int selected_candidate_index_in_page_;
 
   // The observers of the object.
   ObserverList<Observer> observers_;
 
   // Views created in the class will be part of tree of |this|, so these
   // child views will be deleted when |this| is deleted.
   InformationTextArea* auxiliary_text_;
@@ skipping 26 matching lines @@
   // send OnCandidateWindowOpened and OnCandidateWindowClosed events.
   bool was_candidate_window_open_;
 
   DISALLOW_COPY_AND_ASSIGN(CandidateWindowView);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_VIEW_H_