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

chrome/browser/chromeos/input_method/ibus_controller.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_IBUS_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 57 matching lines @@
   // A preferred physical keyboard layout for the input method (e.g., "us",
   // "us(dvorak)", "jp"). Comma separated layout names do NOT appear.
   std::string keyboard_layout_;
   // Preferred virtual keyboard layouts for the input method. Comma separated
   // layout names in order of priority, such as "handwriting,us", could appear.
   std::vector<std::string> virtual_keyboard_layouts_;
   // Language code like "ko", "ja", "en-US", and "zh-CN".
   std::string language_code_;
 };
 
-// A structure which represents a property for an input method engine. For
-// details, please check a comment for the LanguageRegisterImePropertiesFunction
-// typedef below.
-// TODO(yusukes): Rename this struct. "InputMethodProperty" might be better?
-struct ImeProperty {
-  ImeProperty(const std::string& in_key,
+// A structure which represents a property for an input method engine.
+struct 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);
 
-  ImeProperty();
-  ~ImeProperty();
+  InputMethodProperty();
+  ~InputMethodProperty();
 
   // Debug print function.
   std::string ToString() const;
 
   std::string key;  // A key which identifies the property. Non-empty string.
                     // (e.g. "InputMode.HalfWidthKatakana")
-  // DEPRECATED: TODO(yusukes): Remove this when it's ready.
-  std::string deprecated_icon_path;
   std::string label;  // A description of the property. Non-empty string.
                       // (e.g. "Switch to full punctuation mode", "Hiragana")
   bool is_selection_item;  // true if the property is a selection item.
   bool is_selection_item_checked;  // true if |is_selection_item| is true and
                                    // the selection_item is selected.
   int selection_item_id;  // A group ID (>= 0) of the selection item.
                           // kInvalidSelectionItemId if |is_selection_item| is
                           // false.
   static const int kInvalidSelectionItemId = -1;
 };
-typedef std::vector<ImeProperty> ImePropertyList;
+typedef std::vector<InputMethodProperty> InputMethodPropertyList;
 
 // A structure which represents a value of an input method configuration item.
 // This struct is used by SetInputMethodConfig().
 struct InputMethodConfigValue {
   InputMethodConfigValue();
   ~InputMethodConfigValue();
 
   // Debug print function.
   std::string ToString() const;
 
@@ skipping 40 matching lines @@
     //   selection_item_id: 1
     // ----------------------------------
     //   key: InputMode.Katakana
     //   label: Katakana
     //   is_selection_item: true
     //   is_selection_item_checked: false
     //   selection_item_id: 1
     // ----------------------------------
     //   ...
     // ----------------------------------
-    virtual void OnRegisterImeProperties(const ImePropertyList& prop_list) = 0;
+    virtual void OnRegisterImeProperties(
+        const InputMethodPropertyList& prop_list) = 0;
 
     // Called when "UpdateProperty" signal is sent from ibus-daemon. The
     // signal contains one or more properties which is updated
     // recently. Keys the signal contains are a subset of keys registered
     // by the "RegisterProperties" signal above. For example, Japanese
     // input method might send the following properties:
     //
     // ----------------------------------
     //   key: InputMode.Hiragana
     //   label: Hiragana
     //   is_selection_item: true
     //   is_selection_item_checked: false
     //   selection_item_id: ...
     // ----------------------------------
     //   key: InputMode.Katakana
     //   label: Katakana
     //   is_selection_item: true
     //   is_selection_item_checked: true
     //   selection_item_id: ...
     // ----------------------------------
     //
     // Note: Please do not use selection_item_ids in |prop_list|. Dummy
     //       values are filled in the field.
-    virtual void OnUpdateImeProperty(const ImePropertyList& prop_list) = 0;
+    virtual void OnUpdateImeProperty(
+        const InputMethodPropertyList& prop_list) = 0;
 
     // Called when ibus connects or disconnects.
     virtual void OnConnectionChange(bool connected) = 0;
   };
 
   // Creates an instance of the class. The constructor is unused.
   static IBusController* Create();
 
   virtual ~IBusController();
 
@@ skipping 64 matching lines @@
   virtual bool InputMethodIdIsWhitelisted(
       const std::string& input_method_id) = 0;
   // Returns true if |xkb_layout| is supported.
   virtual bool XkbLayoutIsSupported(const std::string& xkb_layout) = 0;
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_H_