| Index: ash/mus/bridge/shell_port_mash.cc
|
| diff --git a/ash/mus/bridge/shell_port_mash.cc b/ash/mus/bridge/shell_port_mash.cc
|
| index 9bdd29777468ca58781173f52a738ca9a1a29ce2..8c2fbf820d25fe4873145038343d37c2b4218b50 100644
|
| --- a/ash/mus/bridge/shell_port_mash.cc
|
| +++ b/ash/mus/bridge/shell_port_mash.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "ash/accelerators/accelerator_controller.h"
|
| #include "ash/accelerators/accelerator_controller_delegate_aura.h"
|
| +#include "ash/ash_switches.h"
|
| #include "ash/aura/key_event_watcher_aura.h"
|
| #include "ash/aura/pointer_watcher_adapter.h"
|
| #include "ash/display/window_tree_host_manager.h"
|
| @@ -50,6 +51,7 @@
|
| #include "ash/wm/window_util.h"
|
| #include "ash/wm/workspace/workspace_event_handler_aura.h"
|
| #include "ash/wm_window.h"
|
| +#include "base/command_line.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "components/user_manager/user_info_impl.h"
|
| #include "services/ui/public/interfaces/constants.mojom.h"
|
| @@ -489,7 +491,9 @@ std::unique_ptr<AshWindowTreeHost> ShellPortMash::CreateAshWindowTreeHost(
|
| window_manager_->window_manager_client()->CreateInitParamsForNewDisplay();
|
| aura_init_params.display_id = init_params.display_id;
|
| aura_init_params.display_init_params = std::move(display_params);
|
| - aura_init_params.use_classic_ime = true;
|
| + aura_init_params.use_classic_ime =
|
| + !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kUseServicifiedIME);
|
| return base::MakeUnique<AshWindowTreeHostMus>(std::move(aura_init_params));
|
| }
|
|
|
|
|