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

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

Issue 2831583005: Enable Config::MUS to use classic IME instead of servicified IME. (Closed)
Patch Set: Addressed feedback. Created 3 years, 7 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/aura/mus/window_tree_client.cc ('k') | ui/aura/mus/window_tree_host_mus_init_params.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_tree_host_mus.cc
diff --git a/ui/aura/mus/window_tree_host_mus.cc b/ui/aura/mus/window_tree_host_mus.cc
index 7e99a23e214ea993b7b6e9abb8d8c43a4d21f0fd..a6500d0c9effe1adb9e03eb6d56982b9e6f846df 100644
--- a/ui/aura/mus/window_tree_host_mus.cc
+++ b/ui/aura/mus/window_tree_host_mus.cc
@@ -84,9 +84,11 @@ WindowTreeHostMus::WindowTreeHostMus(WindowTreeHostMusInitParams init_params)
SetPlatformWindow(base::MakeUnique<ui::StubWindow>(
this, use_default_accelerated_widget, bounds_in_pixels));
- input_method_ = base::MakeUnique<InputMethodMus>(this, window());
- input_method_->Init(init_params.window_tree_client->connector());
- SetSharedInputMethod(input_method_.get());
+ if (!init_params.use_classic_ime) {
+ input_method_ = base::MakeUnique<InputMethodMus>(this, window());
+ input_method_->Init(init_params.window_tree_client->connector());
+ SetSharedInputMethod(input_method_.get());
+ }
compositor()->SetHostHasTransparentBackground(true);
« no previous file with comments | « ui/aura/mus/window_tree_client.cc ('k') | ui/aura/mus/window_tree_host_mus_init_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698