IME for Mus: Send ack for key events after IME driver processes the event.

ui/views/mus/native_widget_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.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/native_widget_mus.h"
 
@@ skipping 28 matching lines @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/views/corewm/tooltip.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/corewm/tooltip_controller.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/mus/drag_drop_client_mus.h"
 #include "ui/views/mus/drop_target_mus.h"
+#include "ui/views/mus/input_method_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/mus/window_manager_constants_converters.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/mus/window_tree_host_mus.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/tooltip_manager_aura.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/custom_frame_view.h"
 #include "ui/wm/core/base_focus_rules.h"
@@ skipping 482 matching lines @@
       content_(new aura::Window(this)),
       last_drop_operation_(ui::DragDropTypes::DRAG_NONE),
       close_widget_factory_(this) {
   window_->set_input_event_handler(this);
   mus_window_observer_ = base::MakeUnique<MusWindowObserver>(this);
 
   // TODO(fsamuel): Figure out lifetime of |window_|.
   aura::SetMusWindow(content_, window_);
   window->SetLocalProperty(kNativeWidgetMusKey, this);
   window_tree_host_ = base::MakeUnique<WindowTreeHostMus>(this, window_);
+  input_method_ =
+      base::MakeUnique<InputMethodMus>(window_tree_host_.get(), window_);
+  window_tree_host_->SetSharedInputMethod(input_method_.get());
 }
 
 NativeWidgetMus::~NativeWidgetMus() {
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) {
     DCHECK(!window_);
     delete native_widget_delegate_;
   } else {
     if (window_)
       window_->set_input_event_handler(nullptr);
     CloseNow();
@@ skipping 147 matching lines @@
   window_->SetCanFocus(params.activatable ==
                        Widget::InitParams::ACTIVATABLE_YES);
   window_->SetCanAcceptEvents(params.accept_events);
 
   window_tree_host_->AddObserver(this);
   window_tree_host_->InitHost();
   hosted_window->SetProperty(kMusWindow, window_);
 
   // TODO(moshayedi): crbug.com/641039. Investigate whether there are any cases
   // where we need input method but don't have the WindowManagerConnection here.
-  if (WindowManagerConnection::Exists()) {
-    window_tree_host_->InitInputMethod(
-        WindowManagerConnection::Get()->connector());
-  }
+  if (WindowManagerConnection::Exists())
+    input_method_->Init(WindowManagerConnection::Get()->connector());
 
   focus_client_ =
       base::MakeUnique<FocusControllerMus>(new FocusRulesImpl(hosted_window));
 
   aura::client::SetFocusClient(hosted_window, focus_client_.get());
   aura::client::SetActivationClient(hosted_window, focus_client_.get());
   screen_position_client_ = base::MakeUnique<ScreenPositionClientMus>(window_);
   aura::client::SetScreenPositionClient(hosted_window,
                                         screen_position_client_.get());
 
@@ skipping 772 matching lines @@
                               last_drop_operation_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, ui::InputEventHandler implementation:
 
 void NativeWidgetMus::OnWindowInputEvent(
     ui::Window* view,
     const ui::Event& event_in,
     std::unique_ptr<base::Callback<void(EventResult)>>* ack_callback) {
+  std::unique_ptr<ui::Event> event = ui::Event::Clone(event_in);
+
+  if (event->IsKeyEvent()) {
+    input_method_->DispatchKeyEvent(event->AsKeyEvent(),
+                                    std::move(*ack_callback));
+    return;
+  }
+
   // Take ownership of the callback, indicating that we will handle it.
   EventAckHandler ack_handler(std::move(*ack_callback));
 
-  std::unique_ptr<ui::Event> event = ui::Event::Clone(event_in);
   // TODO(markdittmer): This should be this->OnEvent(event.get()), but that
   // can't happen until IME is refactored out of in WindowTreeHostMus.
   platform_window_delegate()->DispatchEvent(event.get());
   // NOTE: |this| may be deleted.
 
   ack_handler.set_handled(event->handled());
   // |ack_handler| acks the event on destruction if necessary.
 }
 
 void NativeWidgetMus::OnMusWindowVisibilityChanging(ui::Window* window,
@@ skipping 30 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views