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

ui/aura/mus/window_tree_host_mus.cc

 // Copyright 2015 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 "ui/aura/mus/window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/input_method_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus_delegate.h"
 #include "ui/aura/mus/window_tree_host_mus_init_params.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/class_property.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/platform_window/stub/stub_window.h"
 
+#if defined(OS_CHROMEOS)
+#include "ui/base/ime/input_method_chromeos.h"
+#endif
+
 DECLARE_UI_CLASS_PROPERTY_TYPE(aura::WindowTreeHostMus*);
 
 namespace aura {
 
 namespace {
 
 DEFINE_UI_CLASS_PROPERTY_KEY(
     WindowTreeHostMus*, kWindowTreeHostMusKey, nullptr);
 
 static uint32_t accelerated_widget_count = 1;
@@ skipping 41 matching lines @@
   OnAcceleratedWidgetAvailable(accelerated_widget,
                                GetDisplay().device_scale_factor());
 
   delegate_->OnWindowTreeHostCreated(this);
 
   // Do not advertise accelerated widget; already set manually.
   const bool use_default_accelerated_widget = false;
   SetPlatformWindow(
       base::MakeUnique<ui::StubWindow>(this, use_default_accelerated_widget));
 
-  input_method_ = base::MakeUnique<InputMethodMus>(this, window());
-  input_method_->Init(init_params.window_tree_client->connector());
-  SetSharedInputMethod(input_method_.get());
-
+  InitInputMethod(&init_params);
   compositor()->SetHostHasTransparentBackground(true);
 
   // Mus windows are assumed hidden.
   compositor()->SetVisible(false);
 
   if (init_params.frame_sink_id.is_valid())
     window_mus->SetFrameSinkIdFromServer(init_params.frame_sink_id);
 }
 
 WindowTreeHostMus::~WindowTreeHostMus() {
@@ skipping 15 matching lines @@
   }
 
   return root->GetProperty(kWindowTreeHostMusKey);
 }
 
 void WindowTreeHostMus::SetBoundsFromServer(const gfx::Rect& bounds_in_pixels) {
   base::AutoReset<bool> resetter(&in_set_bounds_from_server_, true);
   SetBoundsInPixels(bounds_in_pixels);
 }
 
+void WindowTreeHostMus::DispatchEventToInputMethod(
+    ui::KeyEvent* event,
+    std::unique_ptr<base::Callback<void(bool)>> ack_callback) {
+#if defined(OS_CHROMEOS)
+  if (input_method_chromeos_) {
+    input_method_chromeos_->DispatchKeyEvent(event, std::move(ack_callback));
+    return;
+  }
+#endif
+  DCHECK(input_method_mus_);
+  input_method_mus_->DispatchKeyEvent(event, std::move(ack_callback));
+}
+
 void WindowTreeHostMus::SetClientArea(
     const gfx::Insets& insets,
     const std::vector<gfx::Rect>& additional_client_area) {
   delegate_->OnWindowTreeHostClientAreaWillChange(this, insets,
                                                   additional_client_area);
 }
 
 void WindowTreeHostMus::SetHitTestMask(const base::Optional<gfx::Rect>& rect) {
   delegate_->OnWindowTreeHostHitTestMaskWillChange(this, rect);
 }
@@ skipping 70 matching lines @@
 
 void WindowTreeHostMus::MoveCursorToScreenLocationInPixels(
     const gfx::Point& location_in_pixels) {
   // TODO: this needs to message the server http://crbug.com/693340. Setting
   // the location is really only appropriate in tests, outside of tests this
   // value is ignored.
   NOTIMPLEMENTED();
   Env::GetInstance()->set_last_mouse_location(location_in_pixels);
 }
 
+void WindowTreeHostMus::InitInputMethod(
+    WindowTreeHostMusInitParams* init_params) {
+#if defined(OS_CHROMEOS)
+  if (init_params->use_classic_ime) {
+    input_method_chromeos_ = base::MakeUnique<ui::InputMethodChromeOS>(this);

[sky, 2017/04/20 20:18:49]

Are you sure we need to set the input method at all in classic? We will soon be
using this code:
https://chromium.googlesource.com/chromium/src/+/master/ash/display/window_tr...
which sets the SharedInputMethod.

+    SetSharedInputMethod(input_method_chromeos_.get());
+    return;
+  }
+#endif  // defined(OS_CHROMEOS)
+
+  input_method_mus_ = base::MakeUnique<InputMethodMus>(this, window());
+  input_method_mus_->Init(init_params->window_tree_client->connector());
+  SetSharedInputMethod(input_method_mus_.get());
+}
+
 }  // namespace aura