Moves CandidateWindow model to ui/base/ime.

chrome/browser/chromeos/input_method/candidate_window_view.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_view.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/candidate_view.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_constants.h"
-#include "chromeos/ime/candidate_window.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/screen.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/corewm/window_animations.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
@@ skipping 46 matching lines @@
 
   gfx::NativeView parent_;
   int offset_;
 
   DISALLOW_COPY_AND_ASSIGN(CandidateWindowBorder);
 };
 
 // Computes the page index. For instance, if the page size is 9, and the
 // cursor is pointing to 13th candidate, the page index will be 1 (2nd
 // page, as the index is zero-origin). Returns -1 on error.
-int ComputePageIndex(const CandidateWindow& candidate_window) {
+int ComputePageIndex(const ui::CandidateWindow& candidate_window) {
   if (candidate_window.page_size() > 0)
     return candidate_window.cursor_position() / candidate_window.page_size();
   return -1;
 }
 
 }  // namespace
 
 class InformationTextArea : public views::View {
  public:
   // InformationTextArea's border is drawn as a separator, it should appear
@@ skipping 68 matching lines @@
       1, theme->GetSystemColor(ui::NativeTheme::kColorId_MenuBorderColor)));
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   auxiliary_text_ = new InformationTextArea(gfx::ALIGN_RIGHT, 0);
   preedit_ = new InformationTextArea(gfx::ALIGN_LEFT, kMinPreeditAreaWidth);
   candidate_area_ = new views::View;
   auxiliary_text_->SetVisible(false);
   preedit_->SetVisible(false);
   candidate_area_->SetVisible(false);
   preedit_->SetBorder(InformationTextArea::BOTTOM);
-  if (candidate_window_.orientation() == CandidateWindow::VERTICAL) {
+  if (candidate_window_.orientation() == ui::CandidateWindow::VERTICAL) {
     AddChildView(preedit_);
     AddChildView(candidate_area_);
     AddChildView(auxiliary_text_);
     auxiliary_text_->SetBorder(InformationTextArea::TOP);
     candidate_area_->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kVertical, 0, 0, 0));
   } else {
     AddChildView(preedit_);
     AddChildView(auxiliary_text_);
     AddChildView(candidate_area_);
@@ skipping 47 matching lines @@
   preedit_->SetText(utf8_text);
 }
 
 void CandidateWindowView::ShowLookupTable() {
   candidate_area_->SetVisible(true);
   auxiliary_text_->SetVisible(candidate_window_.is_auxiliary_text_visible());
   UpdateVisibility();
 }
 
 void CandidateWindowView::UpdateCandidates(
-    const CandidateWindow& new_candidate_window) {
+    const ui::CandidateWindow& new_candidate_window) {
   // Updating the candidate views is expensive. We'll skip this if possible.
   if (!candidate_window_.IsEqual(new_candidate_window)) {
     if (candidate_window_.orientation() != new_candidate_window.orientation()) {
       // If the new layout is vertical, the aux text should appear at the
       // bottom. If horizontal, it should appear between preedit and candidates.
-      if (new_candidate_window.orientation() == CandidateWindow::VERTICAL) {
+      if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL) {
         ReorderChildView(auxiliary_text_, -1);
         auxiliary_text_->SetAlignment(gfx::ALIGN_RIGHT);
         auxiliary_text_->SetBorder(InformationTextArea::TOP);
         candidate_area_->SetLayoutManager(new views::BoxLayout(
             views::BoxLayout::kVertical, 0, 0, 0));
       } else {
         ReorderChildView(auxiliary_text_, 1);
         auxiliary_text_->SetAlignment(gfx::ALIGN_LEFT);
         auxiliary_text_->SetBorder(InformationTextArea::BOTTOM);
         candidate_area_->SetLayoutManager(new views::BoxLayout(
@@ skipping 16 matching lines @@
         current_page_index * new_candidate_window.page_size();
 
     int max_shortcut_width = 0;
     int max_candidate_width = 0;
     for (size_t i = 0; i < candidate_views_.size(); ++i) {
       const size_t index_in_page = i;
       const size_t candidate_index = start_from + index_in_page;
       CandidateView* candidate_view = candidate_views_[index_in_page];
       // Set the candidate text.
       if (candidate_index < new_candidate_window.candidates().size()) {
-        const CandidateWindow::Entry& entry =
+        const ui::CandidateWindow::Entry& entry =
             new_candidate_window.candidates()[candidate_index];
         candidate_view->SetEntry(entry);
         candidate_view->SetState(views::Button::STATE_NORMAL);
         candidate_view->SetInfolistIcon(!entry.description_title.empty());
       } else {
         // Disable the empty row.
-        candidate_view->SetEntry(CandidateWindow::Entry());
+        candidate_view->SetEntry(ui::CandidateWindow::Entry());
         candidate_view->SetState(views::Button::STATE_DISABLED);
         candidate_view->SetInfolistIcon(false);
       }
-      if (new_candidate_window.orientation() == CandidateWindow::VERTICAL) {
+      if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL) {
         int shortcut_width = 0;
         int candidate_width = 0;
         candidate_views_[i]->GetPreferredWidths(
             &shortcut_width, &candidate_width);
         max_shortcut_width = std::max(max_shortcut_width, shortcut_width);
         max_candidate_width = std::max(max_candidate_width, candidate_width);
       }
     }
-    if (new_candidate_window.orientation() == CandidateWindow::VERTICAL) {
+    if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL) {
       for (size_t i = 0; i < candidate_views_.size(); ++i)
         candidate_views_[i]->SetWidths(max_shortcut_width, max_candidate_width);
     }
 
     CandidateWindowBorder* border = static_cast<CandidateWindowBorder*>(
         GetBubbleFrameView()->bubble_border());
-    if (new_candidate_window.orientation() == CandidateWindow::VERTICAL)
+    if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL)
       border->set_offset(max_shortcut_width);
     else
       border->set_offset(0);
   }
   // Update the current candidate window. We'll use candidate_window_ from here.
   // Note that SelectCandidateAt() uses candidate_window_.
   candidate_window_.CopyFrom(new_candidate_window);
 
   // Select the current candidate in the page.
   if (candidate_window_.is_cursor_visible()) {
@@ skipping 20 matching lines @@
 
 void CandidateWindowView::SetCursorBounds(const gfx::Rect& cursor_bounds,
                                           const gfx::Rect& composition_head) {
   if (candidate_window_.show_window_at_composition())
     SetAnchorRect(composition_head);
   else
     SetAnchorRect(cursor_bounds);
 }
 
 void CandidateWindowView::MaybeInitializeCandidateViews(
-    const CandidateWindow& candidate_window) {
-  const CandidateWindow::Orientation orientation =
+    const ui::CandidateWindow& candidate_window) {
+  const ui::CandidateWindow::Orientation orientation =
       candidate_window.orientation();
   const size_t page_size = candidate_window.page_size();
 
   // Reset all candidate_views_ when orientation changes.
   if (orientation != candidate_window_.orientation())
     STLDeleteElements(&candidate_views_);
 
   while (page_size < candidate_views_.size()) {
     delete candidate_views_.back();
     candidate_views_.pop_back();
@@ skipping 35 matching lines @@
   for (size_t i = 0; i < candidate_views_.size(); ++i) {
     if (sender == candidate_views_[i]) {
       FOR_EACH_OBSERVER(Observer, observers_, OnCandidateCommitted(i));
       return;
     }
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos