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

Unified Diff: ash/shell.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 | « ash/mus/bridge/shell_port_mash.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 8cdfec9c861977a5c88ca323d51d7546de3f1125..665d81a94bd4bcc83096667eb8e6ad26e94d49ac 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -935,9 +935,8 @@ void Shell::Init(const ShellInitParams& init_params) {
accelerator_controller_ = shell_port_->CreateAcceleratorController();
maximize_mode_controller_ = base::MakeUnique<MaximizeModeController>();
- if (config == Config::CLASSIC) {
- // Not applicable to mus/mash as events are already routed to InputMethod
- // first.
+ if (config == Config::CLASSIC || config == Config::MUS) {
+ // Not applicable to mash as events are already routed to InputMethod first.
AddPreTargetHandler(
window_tree_host_manager_->input_method_event_handler());
}
« no previous file with comments | « ash/mus/bridge/shell_port_mash.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698