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

Unified Diff: ui/views/mus/native_widget_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: Update mash_browser_tests_manifest. 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
« no previous file with comments | « ui/views/mus/input_method_mus_unittest.cc ('k') | ui/views/mus/text_input_client_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/native_widget_mus.cc
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index dd79ff864b3943e2b20d9400af864fe9aab175ba..e1fbfbb6ba41986f4d466af1eae58703ceead76c 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -32,6 +32,7 @@
#include "ui/gfx/path.h"
#include "ui/native_theme/native_theme_aura.h"
#include "ui/platform_window/platform_window_delegate.h"
+#include "ui/views/mus/window_manager_connection.h"
#include "ui/views/mus/window_manager_constants_converters.h"
#include "ui/views/mus/window_manager_frame_values.h"
#include "ui/views/mus/window_tree_host_mus.h"
@@ -687,6 +688,13 @@ void NativeWidgetMus::InitNativeWidget(const Widget::InitParams& params) {
window_tree_host_->InitHost();
hosted_window->SetProperty(kMusWindow, window_);
+ // TODO(moshayedi): crbug.com/641039. Investigate whether there are any cases
+ // where we need input method but don't have the WindowManagerConnection here.
+ if (WindowManagerConnection::Exists()) {
+ window_tree_host_->InitInputMethod(
+ WindowManagerConnection::Get()->connector());
+ }
+
focus_client_.reset(
new FocusControllerMus(new FocusRulesImpl(hosted_window)));
« no previous file with comments | « ui/views/mus/input_method_mus_unittest.cc ('k') | ui/views/mus/text_input_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698