Enable Config::MUS to use classic IME instead of servicified IME.

ash/display/window_tree_host_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/window_tree_host_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "ash/ash_switches.h"
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/root_window_transformers.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/ime/input_method_event_handler.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
+#include "ash/public/cpp/config.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/capture_client.h"
@@ skipping 783 matching lines @@
   params_with_bounds.offscreen =
       display.id() == display::DisplayManager::kUnifiedDisplayId;
   params_with_bounds.display_id = display.id();
   params_with_bounds.device_scale_factor = display.device_scale_factor();
   params_with_bounds.ui_scale_factor = display_info.configured_ui_scale();
   // The AshWindowTreeHost ends up owned by the RootWindowControllers created
   // by this class.
   AshWindowTreeHost* ash_host =
       AshWindowTreeHost::Create(params_with_bounds).release();
   aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
-  // TODO: Config::MUS should not install an InputMethod.
-  // http://crbug.com/706913
-  if (!host->has_input_method()) {
+  // In mash input method is hosted by the browser process, so we don't need to
+  // create and set it here.
+  if (Shell::GetAshConfig() != Config::MASH) {
+    DCHECK(!host->has_input_method());
     if (!input_method_) {  // Singleton input method instance for Ash.
       input_method_ = ui::CreateInputMethod(this, host->GetAcceleratedWidget());
       // Makes sure the input method is focused by default when created, because
       // Ash uses singleton InputMethod and it won't call OnFocus/OnBlur when
       // the active window changed.
       input_method_->OnFocus();
       input_method_event_handler_.reset(
           new InputMethodEventHandler(input_method_.get()));
     }
     host->SetSharedInputMethod(input_method_.get());
@@ skipping 14 matching lines @@
 
   window_tree_hosts_[display.id()] = ash_host;
   SetDisplayPropertiesOnHost(ash_host, display);
 
   if (switches::ConstrainPointerToRoot())
     ash_host->ConfineCursorToRootWindow();
   return ash_host;
 }
 
 }  // namespace ash