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

Unified Diff: ui/views/mus/window_tree_host_mus.cc

Issue 2230393002: IME for Mus: Make InputMethodMus use the IME Mojo API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix dependencies. Created 4 years, 4 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
« ui/views/mus/input_method_mus.h ('K') | « ui/views/mus/window_tree_host_mus.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_tree_host_mus.cc
diff --git a/ui/views/mus/window_tree_host_mus.cc b/ui/views/mus/window_tree_host_mus.cc
index 3f38b4e1ea7ab23a2eb4798d2317b817c3c44298..2834b3f9e5dd986e798d6d0f38658bd164ab2586 100644
--- a/ui/views/mus/window_tree_host_mus.cc
+++ b/ui/views/mus/window_tree_host_mus.cc
@@ -54,7 +54,7 @@ WindowTreeHostMus::WindowTreeHostMus(NativeWidgetMus* native_widget,
dispatcher()->set_transform_events(false);
compositor()->SetHostHasTransparentBackground(true);
- input_method_.reset(new InputMethodMUS(this, window));
+ input_method_.reset(new InputMethodMus(this, window));
SetSharedInputMethod(input_method_.get());
}
@@ -63,9 +63,14 @@ WindowTreeHostMus::~WindowTreeHostMus() {
DestroyDispatcher();
}
+void WindowTreeHostMus::InitInputMethod(shell::Connector* connector) {
+ input_method_->Init(connector);
+}
+
void WindowTreeHostMus::DispatchEvent(ui::Event* event) {
if (event->IsKeyEvent() && GetInputMethod()) {
GetInputMethod()->DispatchKeyEvent(event->AsKeyEvent());
+ event->StopPropagation();
sky 2016/08/25 20:17:53 I tend to think this should be in InputMethodMus::
Hadi 2016/08/26 15:57:07 Move it. Also I added a temporary check so we only
return;
}
WindowTreeHostPlatform::DispatchEvent(event);
« ui/views/mus/input_method_mus.h ('K') | « ui/views/mus/window_tree_host_mus.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698