Revert 251164 "Split out InputMethodMenuManager from InputMethod..."

trunk/src/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"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #undef FocusIn
 #undef FocusOut
 #undef RootWindow
 #include <map>
 
-#include "ash/ime/input_method_menu_item.h"
-#include "ash/ime/input_method_menu_manager.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/composition_text.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/ibus_keymap.h"
@@ skipping 337 matching lines @@
 
 bool InputMethodEngine::SetMenuItems(const std::vector<MenuItem>& items) {
   return UpdateMenuItems(items);
 }
 
 bool InputMethodEngine::UpdateMenuItems(
     const std::vector<MenuItem>& items) {
   if (!active_)
     return false;
 
-  ash::ime::InputMethodMenuItemList menu_item_list;
+  input_method::InputMethodPropertyList property_list;
   for (std::vector<MenuItem>::const_iterator item = items.begin();
        item != items.end(); ++item) {
-    ash::ime::InputMethodMenuItem property;
+    input_method::InputMethodProperty property;
     MenuItemToProperty(*item, &property);
-    menu_item_list.push_back(property);
+    property_list.push_back(property);
   }
 
-  ash::ime::InputMethodMenuManager::Get()->SetCurrentInputMethodMenuItemList(
-      menu_item_list);
+  input_method::InputMethodManager* manager =
+      input_method::InputMethodManager::Get();
+  if (manager)
+    manager->SetCurrentInputMethodProperties(property_list);
+
   return true;
 }
 
 bool InputMethodEngine::IsActive() const {
   return active_;
 }
 
 void InputMethodEngine::KeyEventDone(input_method::KeyEventHandle* key_data,
                                      bool handled) {
   KeyEventDoneCallback* callback =
@@ skipping 179 matching lines @@
 
 void InputMethodEngine::SetSurroundingText(const std::string& text,
                                            uint32 cursor_pos,
                                            uint32 anchor_pos) {
   observer_->OnSurroundingTextChanged(engine_id_,
                                       text,
                                       static_cast<int>(cursor_pos),
                                       static_cast<int>(anchor_pos));
 }
 
-// TODO(uekawa): rename this method to a more reasonable name.
 void InputMethodEngine::MenuItemToProperty(
     const MenuItem& item,
-    ash::ime::InputMethodMenuItem* property) {
+    input_method::InputMethodProperty* property) {
   property->key = item.id;
 
   if (item.modified & MENU_ITEM_MODIFIED_LABEL) {
     property->label = item.label;
   }
   if (item.modified & MENU_ITEM_MODIFIED_VISIBLE) {
     // TODO(nona): Implement it.
   }
   if (item.modified & MENU_ITEM_MODIFIED_CHECKED) {
     property->is_selection_item_checked = item.checked;
@@ skipping 19 matching lines @@
           // TODO(nona): Implement it.
           break;
       }
     }
   }
 
   // TODO(nona): Support item.children.
 }
 
 }  // namespace chromeos