Rename InputMethodManager::current_input_method() to InputMethodManager::GetCurrentInputMethod().

chrome/browser/chromeos/input_method/ibus_controller.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/ibus_controller.h"
 
 #if defined(HAVE_IBUS)
 #include <ibus.h>
 #endif
 
@@ skipping 119 matching lines @@
 std::string InputMethodDescriptor::ToString() const {
   std::stringstream stream;
   stream << "id=" << id()
          << ", name=" << name()
          << ", keyboard_layout=" << keyboard_layout()
          << ", virtual_keyboard_layouts=" << virtual_keyboard_layouts_.size()
          << ", language_code=" << language_code();
   return stream.str();
 }
 
-ImeProperty::ImeProperty(const std::string& in_key,
+InputMethodProperty::InputMethodProperty(const std::string& in_key,
                          const std::string& in_label,
                          bool in_is_selection_item,
                          bool in_is_selection_item_checked,
                          int in_selection_item_id)
     : key(in_key),
       label(in_label),
       is_selection_item(in_is_selection_item),
       is_selection_item_checked(in_is_selection_item_checked),
       selection_item_id(in_selection_item_id) {
   DCHECK(!key.empty());
 }
 
-ImeProperty::ImeProperty()
+InputMethodProperty::InputMethodProperty()
     : is_selection_item(false),
       is_selection_item_checked(false),
       selection_item_id(kInvalidSelectionItemId) {
 }
 
-ImeProperty::~ImeProperty() {
+InputMethodProperty::~InputMethodProperty() {
 }
 
-std::string ImeProperty::ToString() const {
+std::string InputMethodProperty::ToString() const {
   std::stringstream stream;
   stream << "key=" << key
          << ", label=" << label
          << ", is_selection_item=" << is_selection_item
          << ", is_selection_item_checked=" << is_selection_item_checked
          << ", selection_item_id=" << selection_item_id;
   return stream.str();
 }
 
 InputMethodConfigValue::InputMethodConfigValue()
@@ skipping 82 matching lines @@
 bool PropertyHasChildren(IBusProperty* prop) {
   return prop && prop->sub_props && ibus_prop_list_get(prop->sub_props, 0);
 }
 
 // This function is called by and FlattenProperty() and converts IBus
 // representation of a property, |ibus_prop|, to our own and push_back the
 // result to |out_prop_list|. This function returns true on success, and
 // returns false if sanity checks for |ibus_prop| fail.
 bool ConvertProperty(IBusProperty* ibus_prop,
                      int selection_item_id,
-                     ImePropertyList* out_prop_list) {
+                     InputMethodPropertyList* out_prop_list) {
   DCHECK(ibus_prop);
   DCHECK(ibus_prop->key);
   DCHECK(out_prop_list);
 
   // Sanity checks.
   const bool has_sub_props = PropertyHasChildren(ibus_prop);
   if (has_sub_props && (ibus_prop->type != PROP_TYPE_MENU)) {
     LOG(ERROR) << "The property has sub properties, "
                << "but the type of the property is not PROP_TYPE_MENU";
     return false;
   }
   if ((!has_sub_props) && (ibus_prop->type == PROP_TYPE_MENU)) {
     // This is usually not an error. ibus-daemon sometimes sends empty props.
     VLOG(1) << "Property list is empty";
     return false;
   }
   if (ibus_prop->type == PROP_TYPE_SEPARATOR ||
       ibus_prop->type == PROP_TYPE_MENU) {
     // This is not an error, but we don't push an item for these types.
     return true;
   }
 
   const bool is_selection_item = (ibus_prop->type == PROP_TYPE_RADIO);
   selection_item_id = is_selection_item ?
-      selection_item_id : ImeProperty::kInvalidSelectionItemId;
+      selection_item_id : InputMethodProperty::kInvalidSelectionItemId;
 
   bool is_selection_item_checked = false;
   if (ibus_prop->state == PROP_STATE_INCONSISTENT) {
     LOG(WARNING) << "The property is in PROP_STATE_INCONSISTENT, "
                  << "which is not supported.";
   } else if ((!is_selection_item) && (ibus_prop->state == PROP_STATE_CHECKED)) {
     LOG(WARNING) << "PROP_STATE_CHECKED is meaningful only if the type is "
                  << "PROP_TYPE_RADIO.";
   } else {
     is_selection_item_checked = (ibus_prop->state == PROP_STATE_CHECKED);
@@ skipping 20 matching lines @@
     // Usually tooltips are more descriptive than labels.
     label = (ibus_prop->label && ibus_prop->label->text)
         ? ibus_prop->label->text : "";
   }
   if (label.empty()) {
     // ibus-pinyin has a property whose label and tooltip are empty. Fall back
     // to the key.
     label = Or(ibus_prop->key, "");
   }
 
-  out_prop_list->push_back(ImeProperty(ibus_prop->key,
+  out_prop_list->push_back(InputMethodProperty(ibus_prop->key,
                                        label,
                                        is_selection_item,
                                        is_selection_item_checked,
                                        selection_item_id));
   return true;
 }
 
 // Converts |ibus_prop| to |out_prop_list|. Please note that |ibus_prop|
 // may or may not have children. See the comment for FlattenPropertyList
 // for details. Returns true if no error is found.
 // TODO(yusukes): Write unittest.
-bool FlattenProperty(IBusProperty* ibus_prop, ImePropertyList* out_prop_list) {
+bool FlattenProperty(IBusProperty* ibus_prop,
+                     InputMethodPropertyList* out_prop_list) {
   DCHECK(ibus_prop);
   DCHECK(out_prop_list);
 
   int selection_item_id = -1;
   std::stack<std::pair<IBusProperty*, int> > prop_stack;
   prop_stack.push(std::make_pair(ibus_prop, selection_item_id));
 
   while (!prop_stack.empty()) {
     IBusProperty* prop = prop_stack.top().first;
     const int current_selection_item_id = prop_stack.top().second;
     prop_stack.pop();
 
     // Filter out unnecessary properties.
     if (PropertyKeyIsBlacklisted(prop->key)) {
       continue;
     }
 
-    // Convert |prop| to ImeProperty and push it to |out_prop_list|.
+    // Convert |prop| to InputMethodProperty and push it to |out_prop_list|.
     if (!ConvertProperty(prop, current_selection_item_id, out_prop_list)) {
       return false;
     }
 
     // Process childrens iteratively (if any). Push all sub properties to the
     // stack.
     if (PropertyHasChildren(prop)) {
       ++selection_item_id;
       for (int i = 0;; ++i) {
         IBusProperty* sub_prop = ibus_prop_list_get(prop->sub_props, i);
@@ skipping 28 matching lines @@
 //
 // (Note: Item-3-X is a selection item since they're on a sub menu.)
 //
 // Output:
 //
 // Item-1, Item-2, Item-3-1, Item-3-2, Item-3-3, Item-4
 // (Note: SubMenuRoot does not appear in the output.)
 // ======================================================================
 // TODO(yusukes): Write unittest.
 bool FlattenPropertyList(
-    IBusPropList* ibus_prop_list, ImePropertyList* out_prop_list) {
+    IBusPropList* ibus_prop_list, InputMethodPropertyList* out_prop_list) {
   DCHECK(ibus_prop_list);
   DCHECK(out_prop_list);
 
   IBusProperty* fake_root_prop = ibus_property_new("Dummy.Key",
                                                    PROP_TYPE_MENU,
                                                    NULL, /* label */
                                                    "", /* icon */
                                                    NULL, /* tooltip */
                                                    FALSE, /* sensitive */
                                                    FALSE, /* visible */
@@ skipping 558 matching lines @@
     if (ibus_config_ && !ibus_bus_is_connected(ibus_)) {
       g_object_unref(ibus_config_);
       ibus_config_ = NULL;
     }
   }
 
   // Handles "RegisterProperties" signal from chromeos_input_method_ui.
   void DoRegisterProperties(IBusPropList* ibus_prop_list) {
     VLOG(1) << "RegisterProperties" << (ibus_prop_list ? "" : " (clear)");
 
-    ImePropertyList prop_list;  // our representation.
+    InputMethodPropertyList prop_list;  // our representation.
     if (ibus_prop_list) {
       // You can call
       //   LOG(INFO) << "\n" << PrintPropList(ibus_prop_list, 0);
       // here to dump |ibus_prop_list|.
       if (!FlattenPropertyList(ibus_prop_list, &prop_list)) {
         // Clear properties on errors.
         DoRegisterProperties(NULL);
         return;
       }
     }
@@ skipping 190 matching lines @@
 
   // Handles "UpdateProperty" signal from chromeos_input_method_ui.
   void UpdateProperty(IBusPanelService* panel, IBusProperty* ibus_prop) {
     VLOG(1) << "UpdateProperty";
     DCHECK(ibus_prop);
 
     // You can call
     //   LOG(INFO) << "\n" << PrintProp(ibus_prop, 0);
     // here to dump |ibus_prop|.
 
-    ImePropertyList prop_list;  // our representation.
+    InputMethodPropertyList prop_list;  // our representation.
     if (!FlattenProperty(ibus_prop, &prop_list)) {
       // Don't update the UI on errors.
       LOG(ERROR) << "Malformed properties are detected";
       return;
     }
     // Notify the change.
     if (!prop_list.empty()) {
       FOR_EACH_OBSERVER(Observer, observers_,
                         OnUpdateImeProperty(prop_list));
     }
@@ skipping 175 matching lines @@
 #else
   return new IBusControllerStubImpl;
 #endif
 }
 
 IBusController::~IBusController() {
 }
 
 }  // namespace input_method
 }  // namespace chromeos