diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 17:45:00 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 17:45:00 +0000 |
| commit | f199c026f5acd6eae4c0ca09ca490fa0998772a9 (patch) | |
| tree | 5704a25e4d7a820538131f3a391287cbc1221af0 /chrome/browser/chromeos/input_method/input_method_manager_impl.h | |
| parent | 14773353dd637c48cdaac8f6574ad02844e2b39c (diff) | |
| download | chromium_src-f199c026f5acd6eae4c0ca09ca490fa0998772a9.zip chromium_src-f199c026f5acd6eae4c0ca09ca490fa0998772a9.tar.gz chromium_src-f199c026f5acd6eae4c0ca09ca490fa0998772a9.tar.bz2 | |
Support pending ChangeInputMethod.
We can't call ChangeInputMethod without initialization of
ComponentExtensionIMEManager, because whitelisted input method is not available
before the initialization.
BUG=164377
TEST=None
Review URL: https://chromiumcodereview.appspot.com/13511002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192089 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 | 5 |
1 files changed, 5 insertions, 0 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 601ed52..c061c87 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -98,6 +98,9 @@ class InputMethodManagerImpl : public InputMethodManager, CandidateWindowController* candidate_window_controller); // Sets |xkeyboard_|. void SetXKeyboardForTesting(XKeyboard* xkeyboard); + // Initialize |component_extension_manager_|. + void InitializeComponentExtensionForTesting( + scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate); private: // IBusController overrides: @@ -201,6 +204,8 @@ class InputMethodManagerImpl : public InputMethodManager, // auto-repeat interval. scoped_ptr<XKeyboard> xkeyboard_; + std::string pending_input_method_; + base::ThreadChecker thread_checker_; base::WeakPtrFactory<InputMethodManagerImpl> weak_ptr_factory_; |