diff options
| author | uekawa@chromium.org <uekawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 15:16:52 +0000 |
|---|---|---|
| committer | uekawa@chromium.org <uekawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 15:16:52 +0000 |
| commit | 5ade0d0be4a611201bfd53bc82b317e0e24ac5df (patch) | |
| tree | aac847f07e813b2cf57da6ea6c7e96394f500ca4 /chrome/browser/chromeos/input_method/mock_input_method_manager.cc | |
| parent | 649ee534865eb0b689cb8311f453974d97e0ab9a (diff) | |
| download | chromium_src-5ade0d0be4a611201bfd53bc82b317e0e24ac5df.zip chromium_src-5ade0d0be4a611201bfd53bc82b317e0e24ac5df.tar.gz chromium_src-5ade0d0be4a611201bfd53bc82b317e0e24ac5df.tar.bz2 | |
Reland of: Split out InputMethodMenuManager from InputMethodManager.
Rename input_method_property to input_method_menu_item, and move to ash/ime.
This is a reland of https://codereview.chromium.org/150203015,reverted by https://codereview.chromium.org/165453002
Use Singleton<> instead of trying to maintain my own singleton.
BUG=342336, 343044
Review URL: https://codereview.chromium.org/165783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/mock_input_method_manager.cc')
| -rw-r--r-- | chrome/browser/chromeos/input_method/mock_input_method_manager.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc index 8c0594f..5d55d7b 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc @@ -91,7 +91,7 @@ void MockInputMethodManager::ChangeInputMethod( const std::string& input_method_id) { } -void MockInputMethodManager::ActivateInputMethodProperty( +void MockInputMethodManager::ActivateInputMethodMenuItem( const std::string& key) { } @@ -144,15 +144,6 @@ InputMethodDescriptor MockInputMethodManager::GetCurrentInputMethod() const { return descriptor; } -InputMethodPropertyList -MockInputMethodManager::GetCurrentInputMethodProperties() const { - return InputMethodPropertyList(); -} - -void MockInputMethodManager::SetCurrentInputMethodProperties( - const InputMethodPropertyList& property_list) { -} - XKeyboard* MockInputMethodManager::GetXKeyboard() { return &xkeyboard_; } |