summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
authorshuchen@chromium.org <shuchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-06 16:34:51 +0000
committershuchen@chromium.org <shuchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-06 16:34:51 +0000
commit6a5a76706b426b010951aeda90921adb37bae6b8 (patch)
treefae07e0f8ebb2f23c0234cafcabb5860871faa37 /ui/base
parent049136bafee4aec5736b85fb85002694785821b1 (diff)
downloadchromium_src-6a5a76706b426b010951aeda90921adb37bae6b8.zip
chromium_src-6a5a76706b426b010951aeda90921adb37bae6b8.tar.gz
chromium_src-6a5a76706b426b010951aeda90921adb37bae6b8.tar.bz2
Refactoring for InputMethodEngine and InputMethodEventRouter.
1) Makes InputMethodEngine extension based instead of input component based. 2) Makes InputMethodEngine independent to user profile. 3) Makes InputMethodEventRouter independent to user profile, except forwarding events to extension. BUG=342336 TEST=Verified on sandbox. Review URL: https://codereview.chromium.org/433163005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/ime/chromeos/ime_bridge.h2
-rw-r--r--ui/base/ime/chromeos/mock_ime_engine_handler.cc2
-rw-r--r--ui/base/ime/chromeos/mock_ime_engine_handler.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/ime/chromeos/ime_bridge.h b/ui/base/ime/chromeos/ime_bridge.h
index 2464f3f..a4b5fef 100644
--- a/ui/base/ime/chromeos/ime_bridge.h
+++ b/ui/base/ime/chromeos/ime_bridge.h
@@ -72,7 +72,7 @@ class UI_BASE_EXPORT IMEEngineHandlerInterface {
virtual void FocusOut() = 0;
// Called when the IME is enabled.
- virtual void Enable() = 0;
+ virtual void Enable(const std::string& component_id) = 0;
// Called when the IME is disabled.
virtual void Disable() = 0;
diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.cc b/ui/base/ime/chromeos/mock_ime_engine_handler.cc
index 000feef..ca855a0 100644
--- a/ui/base/ime/chromeos/mock_ime_engine_handler.cc
+++ b/ui/base/ime/chromeos/mock_ime_engine_handler.cc
@@ -33,7 +33,7 @@ void MockIMEEngineHandler::FocusOut() {
last_text_input_context_.type = ui::TEXT_INPUT_TYPE_NONE;
}
-void MockIMEEngineHandler::Enable() {
+void MockIMEEngineHandler::Enable(const std::string& component_id) {
}
void MockIMEEngineHandler::Disable() {
diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.h b/ui/base/ime/chromeos/mock_ime_engine_handler.h
index bea6a8b..112c0dd 100644
--- a/ui/base/ime/chromeos/mock_ime_engine_handler.h
+++ b/ui/base/ime/chromeos/mock_ime_engine_handler.h
@@ -18,7 +18,7 @@ class UI_BASE_EXPORT MockIMEEngineHandler : public IMEEngineHandlerInterface {
virtual void FocusIn(const InputContext& input_context) OVERRIDE;
virtual void FocusOut() OVERRIDE;
- virtual void Enable() OVERRIDE;
+ virtual void Enable(const std::string& component_id) OVERRIDE;
virtual void Disable() OVERRIDE;
virtual void PropertyActivate(const std::string& property_name) OVERRIDE;
virtual void Reset() OVERRIDE;