summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/cros
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 09:20:55 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 09:20:55 +0000
commita4b1ed1bfbed38a0747d1368a5b4da13962f59b2 (patch)
treeff13a1d13ff8d93e6a1bfb7ee2984ab425dbce0a /chrome/browser/chromeos/cros
parent48e4e8be86f1e40372ad5093173189c8a4d5f278 (diff)
downloadchromium_src-a4b1ed1bfbed38a0747d1368a5b4da13962f59b2.zip
chromium_src-a4b1ed1bfbed38a0747d1368a5b4da13962f59b2.tar.gz
chromium_src-a4b1ed1bfbed38a0747d1368a5b4da13962f59b2.tar.bz2
Get rid of InputMethodLibrary::GetImeConfig().
We don't use it and don't it as we keep the input method configurations in Chrome's preferences. BUG=chromium-os:11480 TEST=chrome builds. Review URL: http://codereview.chromium.org/6456020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros')
-rw-r--r--chrome/browser/chromeos/cros/input_method_library.cc18
-rw-r--r--chrome/browser/chromeos/cros/input_method_library.h12
-rw-r--r--chrome/browser/chromeos/cros/mock_input_method_library.h2
3 files changed, 2 insertions, 30 deletions
diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc
index 5d6b2c3..42f56d8 100644
--- a/chrome/browser/chromeos/cros/input_method_library.cc
+++ b/chrome/browser/chromeos/cros/input_method_library.cc
@@ -200,18 +200,6 @@ class InputMethodLibraryImpl : public InputMethodLibrary,
return false;
}
- virtual bool GetImeConfig(const std::string& section,
- const std::string& config_name,
- ImeConfigValue* out_value) {
- if (!initialized_successfully_)
- return false;
-
- return chromeos::GetImeConfig(input_method_status_connection_,
- section.c_str(),
- config_name.c_str(),
- out_value);
- }
-
virtual bool SetImeConfig(const std::string& section,
const std::string& config_name,
const ImeConfigValue& value) {
@@ -828,12 +816,6 @@ class InputMethodLibraryStubImpl : public InputMethodLibrary {
return true;
}
- virtual bool GetImeConfig(const std::string& section,
- const std::string& config_name,
- ImeConfigValue* out_value) {
- return false;
- }
-
virtual bool SetImeConfig(const std::string& section,
const std::string& config_name,
const ImeConfigValue& value) {
diff --git a/chrome/browser/chromeos/cros/input_method_library.h b/chrome/browser/chromeos/cros/input_method_library.h
index 0d6e360..36b810d 100644
--- a/chrome/browser/chromeos/cros/input_method_library.h
+++ b/chrome/browser/chromeos/cros/input_method_library.h
@@ -83,20 +83,12 @@ class InputMethodLibrary {
// Returns true if the input method specified by |input_method_id| is active.
virtual bool InputMethodIsActivated(const std::string& input_method_id) = 0;
- // Get a configuration of ibus-daemon or IBus engines and stores it on
- // |out_value|. Returns true if |out_value| is successfully updated.
- // When you would like to retrieve 'panel/custom_font', |section| should
- // be "panel", and |config_name| should be "custom_font".
- virtual bool GetImeConfig(const std::string& section,
- const std::string& config_name,
- ImeConfigValue* out_value) = 0;
-
// Updates a configuration of ibus-daemon or IBus engines with |value|.
// Returns true if the configuration (and all pending configurations, if any)
// are processed. If ibus-daemon is not running, this function just queues
// the request and returns false.
- // You can specify |section| and |config_name| arguments in the same way
- // as GetImeConfig() above.
+ // When you would like to set 'panel/custom_font', |section| should
+ // be "panel", and |config_name| should be "custom_font".
// Notice: This function might call the Observer::ActiveInputMethodsChanged()
// callback function immediately, before returning from the SetImeConfig
// function. See also http://crosbug.com/5217.
diff --git a/chrome/browser/chromeos/cros/mock_input_method_library.h b/chrome/browser/chromeos/cros/mock_input_method_library.h
index 6957e81..bbff415 100644
--- a/chrome/browser/chromeos/cros/mock_input_method_library.h
+++ b/chrome/browser/chromeos/cros/mock_input_method_library.h
@@ -27,8 +27,6 @@ class MockInputMethodLibrary : public InputMethodLibrary {
MOCK_METHOD1(ChangeInputMethod, void(const std::string&));
MOCK_METHOD2(SetImePropertyActivated, void(const std::string&, bool));
MOCK_METHOD1(InputMethodIsActivated, bool(const std::string&));
- MOCK_METHOD3(GetImeConfig, bool(const std::string&, const std::string&,
- ImeConfigValue*));
MOCK_METHOD3(SetImeConfig, bool(const std::string&, const std::string&,
const ImeConfigValue&));
MOCK_CONST_METHOD0(previous_input_method, const InputMethodDescriptor&(void));