summaryrefslogtreecommitdiffstats
path: root/chromeos/ime
diff options
context:
space:
mode:
authorkomatsu@chromium.org <komatsu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-30 03:09:09 +0000
committerkomatsu@chromium.org <komatsu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-30 03:09:09 +0000
commit244a421fd3f3c8f044645fbef7c3c57d65465472 (patch)
tree08a879e5fa7bf9c728305c9052fe77556a66480e /chromeos/ime
parentd4adc303273d5bb5d096b1316e3d1855dbf540c7 (diff)
downloadchromium_src-244a421fd3f3c8f044645fbef7c3c57d65465472.zip
chromium_src-244a421fd3f3c8f044645fbef7c3c57d65465472.tar.gz
chromium_src-244a421fd3f3c8f044645fbef7c3c57d65465472.tar.bz2
Remove the DBus dependency on CommitText.
BUG=288388 Review URL: https://codereview.chromium.org/23498022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/ime')
-rw-r--r--chromeos/ime/ibus_bridge.h2
-rw-r--r--chromeos/ime/mock_ime_input_context_handler.cc4
-rw-r--r--chromeos/ime/mock_ime_input_context_handler.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/chromeos/ime/ibus_bridge.h b/chromeos/ime/ibus_bridge.h
index 17be71b..3cf7c5f 100644
--- a/chromeos/ime/ibus_bridge.h
+++ b/chromeos/ime/ibus_bridge.h
@@ -21,7 +21,7 @@ class IBusLookupTable;
class CHROMEOS_EXPORT IBusInputContextHandlerInterface {
public:
// Called when the engine commit a text.
- virtual void CommitText(const IBusText& text) = 0;
+ virtual void CommitText(const std::string& text) = 0;
// Called when the engine forward a key event.
virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode, uint32 state) = 0;
diff --git a/chromeos/ime/mock_ime_input_context_handler.cc b/chromeos/ime/mock_ime_input_context_handler.cc
index 67281c1..135e0f6 100644
--- a/chromeos/ime/mock_ime_input_context_handler.cc
+++ b/chromeos/ime/mock_ime_input_context_handler.cc
@@ -20,9 +20,9 @@ MockIMEInputContextHandler::MockIMEInputContextHandler()
MockIMEInputContextHandler::~MockIMEInputContextHandler() {
}
-void MockIMEInputContextHandler::CommitText(const IBusText& text) {
+void MockIMEInputContextHandler::CommitText(const std::string& text) {
++commit_text_call_count_;
- last_commit_text_ = text.text();
+ last_commit_text_ = text;
}
void MockIMEInputContextHandler::ForwardKeyEvent(uint32 keyval,
diff --git a/chromeos/ime/mock_ime_input_context_handler.h b/chromeos/ime/mock_ime_input_context_handler.h
index 054c2ed..6d5630a 100644
--- a/chromeos/ime/mock_ime_input_context_handler.h
+++ b/chromeos/ime/mock_ime_input_context_handler.h
@@ -27,7 +27,7 @@ class CHROMEOS_EXPORT MockIMEInputContextHandler
MockIMEInputContextHandler();
virtual ~MockIMEInputContextHandler();
- virtual void CommitText(const IBusText& text) OVERRIDE;
+ virtual void CommitText(const std::string& text) OVERRIDE;
virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode,
uint32 state) OVERRIDE;
virtual void UpdatePreeditText(const IBusText& text,