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/input_method_manager_impl.h | |
| 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/input_method_manager_impl.h')
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_manager_impl.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index f24152e..5716704 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -66,7 +66,7 @@ class InputMethodManagerImpl : public InputMethodManager, virtual bool EnableInputMethod(const std::string& new_active_input_method_id) OVERRIDE; virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE; - virtual void ActivateInputMethodProperty(const std::string& key) OVERRIDE; + virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE; virtual void AddInputMethodExtension( const std::string& id, InputMethodEngineInterface* instance) OVERRIDE; @@ -80,10 +80,6 @@ class InputMethodManagerImpl : public InputMethodManager, const ui::Accelerator& accelerator) OVERRIDE; virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE; - virtual InputMethodPropertyList - GetCurrentInputMethodProperties() const OVERRIDE; - virtual void SetCurrentInputMethodProperties( - const InputMethodPropertyList& property_list) OVERRIDE; virtual XKeyboard* GetXKeyboard() OVERRIDE; virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE; @@ -101,9 +97,6 @@ class InputMethodManagerImpl : public InputMethodManager, scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate); private: - // Notifies observers that the property list is updated. - void PropertyChanged(); - // CandidateWindowController::Observer overrides: virtual void CandidateClicked(int index) OVERRIDE; virtual void CandidateWindowOpened() OVERRIDE; @@ -189,9 +182,6 @@ class InputMethodManagerImpl : public InputMethodManager, // those created by extension. std::map<std::string, InputMethodDescriptor> extra_input_methods_; - // Property list of the input method. This is set by extension IMEs. - InputMethodPropertyList property_list_; - // The candidate window. This will be deleted when the APP_TERMINATING // message is sent. scoped_ptr<CandidateWindowController> candidate_window_controller_; |