Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: ui/base/ime/fake_input_method.cc

Issue 45733008: sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/fake_input_method.h ('k') | ui/base/ime/input_method.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/fake_input_method.cc
diff --git a/ui/base/ime/fake_input_method.cc b/ui/base/ime/fake_input_method.cc
index 322130fe4d68dd1a0bb0e94d2d66dc10c6e39518..dd2d9aea67d04e96d37697050e30c7e73e1ace7c 100644
--- a/ui/base/ime/fake_input_method.cc
+++ b/ui/base/ime/fake_input_method.cc
@@ -67,7 +67,11 @@ TextInputClient* FakeInputMethod::GetTextInputClient() const {
return text_input_client_;
}
-bool FakeInputMethod::DispatchKeyEvent(const base::NativeEvent& native_event) {
+bool FakeInputMethod::DispatchKeyEvent(const ui::KeyEvent& event) {
+ if (!event.HasNativeEvent())
+ return DispatchFabricatedKeyEvent(event);
+
+ const base::NativeEvent& native_event = event.native_event();
bool handled = false;
#if defined(OS_WIN)
if (native_event.message == WM_CHAR) {
@@ -83,11 +87,11 @@ bool FakeInputMethod::DispatchKeyEvent(const base::NativeEvent& native_event) {
DCHECK(native_event);
if (native_event->type == KeyRelease) {
// On key release, just dispatch it.
- handled = delegate_->DispatchKeyEventPostIME(native_event);
+ handled = delegate_->DispatchKeyEventPostIME(event);
} else {
const uint32 state = EventFlagsFromXFlags(native_event->xkey.state);
// Send a RawKeyDown event first,
- handled = delegate_->DispatchKeyEventPostIME(native_event);
+ handled = delegate_->DispatchKeyEventPostIME(event);
if (text_input_client_) {
// then send a Char event via ui::TextInputClient.
const KeyboardCode key_code = ui::KeyboardCodeFromNative(native_event);
« no previous file with comments | « ui/base/ime/fake_input_method.h ('k') | ui/base/ime/input_method.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698