IME for Mus: Send TextInputClient information to IMEDriver.

ui/aura/mus/input_method_mus.cc

 // Copyright (c) 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/input_method_mus.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
@@ skipping 74 matching lines @@
 
 void InputMethodMus::DispatchKeyEvent(ui::KeyEvent* event) {
   DispatchKeyEvent(event, nullptr);
 }
 
 void InputMethodMus::OnTextInputTypeChanged(const ui::TextInputClient* client) {
   if (IsTextInputClientFocused(client))
     UpdateTextInputType();
   InputMethodBase::OnTextInputTypeChanged(client);
 
-  if (input_method_) {
+  if (input_method_)
     input_method_->OnTextInputTypeChanged(client->GetTextInputType());
-  }
 }
 
 void InputMethodMus::OnCaretBoundsChanged(const ui::TextInputClient* client) {
   if (input_method_)
     input_method_->OnCaretBoundsChanged(client->GetCaretBounds());
 }
 
 void InputMethodMus::CancelComposition(const ui::TextInputClient* client) {
   if (input_method_)
     input_method_->CancelComposition();
 }
 
 void InputMethodMus::OnInputLocaleChanged() {
   // TODO(moshayedi): crbug.com/637418. Not supported in ChromeOS. Investigate
   // whether we want to support this or not.
 }
 
 bool InputMethodMus::IsCandidatePopupOpen() const {
   // TODO(moshayedi): crbug.com/637416. Implement this properly when we have a
   // mean for displaying candidate list popup.
   return false;
 }
 
 void InputMethodMus::OnDidChangeFocusedClient(
     ui::TextInputClient* focused_before,
     ui::TextInputClient* focused) {
   InputMethodBase::OnDidChangeFocusedClient(focused_before, focused);
   UpdateTextInputType();
 
+  // TODO(moshayedi): crbug.com/681563. Handle when there is no focused clients.
+  if (!focused)
+    return;
+
   text_input_client_ = base::MakeUnique<TextInputClientImpl>(focused);
   if (ime_server_) {
-    ime_server_->StartSession(text_input_client_->CreateInterfacePtrAndBind(),
-                              MakeRequest(&input_method_));
+    ui::mojom::StartSessionDetailsPtr details =
+        ui::mojom::StartSessionDetails::New();
+    details->client = text_input_client_->CreateInterfacePtrAndBind();
+    details->input_method_request = MakeRequest(&input_method_);
+    details->text_input_type = focused->GetTextInputType();
+    details->text_input_mode = focused->GetTextInputMode();
+    details->text_direction = focused->GetTextDirection();
+    details->text_input_flags = focused->GetTextInputFlags();
+    details->caret_bounds = focused->GetCaretBounds();
+    ime_server_->StartSession(std::move(details));
   }
 }
 
 void InputMethodMus::UpdateTextInputType() {
   ui::TextInputType type = GetTextInputType();
   mojo::TextInputStatePtr state = mojo::TextInputState::New();
   state->type = mojo::ConvertTo<mojo::TextInputType>(type);
   if (window_) {
     WindowPortMus* window_impl_mus = WindowPortMus::Get(window_);
     if (type != ui::TEXT_INPUT_TYPE_NONE)
@@ skipping 20 matching lines @@
     event_result = EventResult::HANDLED;
   }
   // |ack_callback| can be null if the standard form of DispatchKeyEvent() is
   // called instead of the version which provides a callback. In mus+ash we
   // use the version with callback, but some unittests use the standard form.
   if (ack_callback)
     ack_callback->Run(event_result);
 }
 
 }  // namespace aura