IME for Mus: Send TextInputClient information to IMEDriver.

services/ui/ime/ime_server_impl.cc

 // Copyright 2016 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 "services/ui/ime/ime_server_impl.h"
 
+#include "base/memory/ptr_util.h"
 #include "services/catalog/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/ime/ime_registrar_impl.h"
 
 namespace ui {
 
 IMEServerImpl::IMEServerImpl() : current_id_(0) {}
 
 IMEServerImpl::~IMEServerImpl() {}
 
@@ skipping 22 matching lines @@
   // now we only register the first driver to avoid clients of the previous
   // driver from hanging.
   if (driver_)
     return;
 
   // TODO(moshayedi): crbug.com/664267. Make sure this is the driver we
   // requested at OnGotCatalogEntries().
   driver_ = std::move(driver);
 
   while (!pending_requests_.empty()) {
-    driver_->StartSession(current_id_++,
-                          std::move(pending_requests_.front().first),
-                          std::move(pending_requests_.front().second));
+    driver_->StartSession(
+        current_id_++, std::move(pending_requests_.front()->client_info),
+        std::move(pending_requests_.front()->client),
+        std::move(pending_requests_.front()->input_method_request));
     pending_requests_.pop();
   }
 }
 
 void IMEServerImpl::StartSession(
+    mojom::TextInputClientInformationPtr client_info,
     mojom::TextInputClientPtr client,
     mojom::InputMethodRequest input_method_request) {
   if (driver_.get()) {
     // TODO(moshayedi): crbug.com/634431. This will forward all calls from
     // clients to the driver as they are. We may need to check |caret_bounds|
     // parameter of InputMethod::OnCaretBoundsChanged() here and limit them to
     // client's focused window.
-    driver_->StartSession(current_id_++, std::move(client),
-                          std::move(input_method_request));
+    driver_->StartSession(current_id_++, std::move(client_info),
+                          std::move(client), std::move(input_method_request));
   } else {
-    pending_requests_.push(
-        std::make_pair(std::move(client), std::move(input_method_request)));
+    pending_requests_.push(base::MakeUnique<IMEServerImpl::PendingRequest>(
+        std::move(client_info), std::move(client),
+        std::move(input_method_request)));
   }
 }
 
 void IMEServerImpl::OnGotCatalogEntries(
     std::vector<catalog::mojom::EntryPtr> entries) {
   // TODO(moshayedi): crbug.com/662157. Decide what to do when number of
   // available IME drivers isn't exactly one.
   if (entries.size() == 0)
     return;
   connector_->Connect((*entries.begin())->name);
 }
 
+IMEServerImpl::PendingRequest::PendingRequest(
+    mojom::TextInputClientInformationPtr client_info,
+    mojom::TextInputClientPtr client,
+    mojom::InputMethodRequest input_method_request)
+    : client_info(std::move(client_info)),
+      client(std::move(client)),
+      input_method_request(std::move(input_method_request)) {}
+
+IMEServerImpl::PendingRequest::~PendingRequest() {}
+
 }  // namespace ui