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); |