Move the local struct definitions off ui/base/ime.

chrome/browser/chromeos/input_method/input_method_engine.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/chromeos/input_method/input_method_engine.h"
 
 #include <utility>
 
 #undef FocusIn
 #undef FocusOut
@@ skipping 22 matching lines @@
 #include "ui/chromeos/ime/input_method_menu_item.h"
 #include "ui/chromeos/ime/input_method_menu_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
 
+using input_method::InputMethodEngineBase;
+
 namespace chromeos {
 
 namespace {
 
 const char kErrorNotActive[] = "IME is not active";
 const char kErrorWrongContext[] = "Context is not active";
 const char kCandidateNotFound[] = "Candidate not found";
 
+// The default entry number of a page in CandidateWindowProperty.
+const int kDefaultPageSize = 9;
+
 }  // namespace
 
+InputMethodEngine::MenuItem::MenuItem() {}
+
+InputMethodEngine::MenuItem::~MenuItem() {}
+
+InputMethodEngine::Candidate::Candidate() {}
+
+InputMethodEngine::Candidate::~Candidate() {}
+
+// When the default values are changed, please modify
+// CandidateWindow::CandidateWindowProperty defined in chromeos/ime/ too.
+InputMethodEngine::CandidateWindowProperty::CandidateWindowProperty()
+    : page_size(kDefaultPageSize),
+      is_cursor_visible(true),
+      is_vertical(false),
+      show_window_at_composition(false) {}
+
+InputMethodEngine::CandidateWindowProperty::~CandidateWindowProperty() {}
+
 InputMethodEngine::InputMethodEngine()
     : candidate_window_(new ui::CandidateWindow()), window_visible_(false) {}
 
 InputMethodEngine::~InputMethodEngine() {}
 
 bool InputMethodEngine::SendKeyEvents(
     int context_id,
     const std::vector<KeyboardEvent>& events) {
   if (!IsActive()) {
     return false;
@@ skipping 36 matching lines @@
   return true;
 }
 
 const InputMethodEngine::CandidateWindowProperty&
 InputMethodEngine::GetCandidateWindowProperty() const {
   return candidate_window_property_;
 }
 
 void InputMethodEngine::SetCandidateWindowProperty(
     const CandidateWindowProperty& property) {
-  // Type conversion from IMEEngineHandlerInterface::CandidateWindowProperty to
+  // Type conversion from InputMethodEngine::CandidateWindowProperty to
   // CandidateWindow::CandidateWindowProperty defined in chromeos/ime/.
   ui::CandidateWindow::CandidateWindowProperty dest_property;
   dest_property.page_size = property.page_size;
   dest_property.is_cursor_visible = property.is_cursor_visible;
   dest_property.is_vertical = property.is_vertical;
   dest_property.show_window_at_composition =
       property.show_window_at_composition;
   dest_property.cursor_position =
       candidate_window_->GetProperty().cursor_position;
   dest_property.auxiliary_text = property.auxiliary_text;
@@ skipping 149 matching lines @@
   observer_->OnMenuItemActivated(active_component_id_, property_name);
 }
 
 void InputMethodEngine::CandidateClicked(uint32_t index) {
   if (index > candidate_ids_.size()) {
     return;
   }
 
   // Only left button click is supported at this moment.
   observer_->OnCandidateClicked(active_component_id_, candidate_ids_.at(index),
-                                ui::IMEEngineObserver::MOUSE_BUTTON_LEFT);
+                                InputMethodEngineBase::MOUSE_BUTTON_LEFT);
 }
 
 // TODO(uekawa): rename this method to a more reasonable name.
 void InputMethodEngine::MenuItemToProperty(
     const MenuItem& item,
     ui::ime::InputMethodMenuItem* property) {
   property->key = item.id;
 
   if (item.modified & MENU_ITEM_MODIFIED_LABEL) {
     property->label = item.label;
@@ skipping 25 matching lines @@
           // TODO(nona): Implement it.
           break;
       }
     }
   }
 
   // TODO(nona): Support item.children.
 }
 
 }  // namespace chromeos