IME for Mus: Send TextInputClient information to IMEDriver.

services/ui/ime/ime_server_impl.h

Index: services/ui/ime/ime_server_impl.h
diff --git a/services/ui/ime/ime_server_impl.h b/services/ui/ime/ime_server_impl.h
index 22156cb64723b2803f41bf18114790d33b7f1505..0d7254f9e8ce4c98b25479fda0850ac9e5f6fa00 100644
--- a/services/ui/ime/ime_server_impl.h
+++ b/services/ui/ime/ime_server_impl.h
@@ -28,7 +28,8 @@ class IMEServerImpl : public mojom::IMEServer {
 
  private:
   // mojom::IMEServer:
-  void StartSession(mojom::TextInputClientPtr client,
+  void StartSession(mojom::TextInputClientInformationPtr client_info,
+                    mojom::TextInputClientPtr client,
                     mojom::InputMethodRequest input_method) override;
 
   void OnGotCatalogEntries(std::vector<catalog::mojom::EntryPtr> entries);
@@ -39,9 +40,16 @@ class IMEServerImpl : public mojom::IMEServer {
   mojom::IMEDriverPtr driver_;
   int current_id_;
 
-  using PendingRequest =
-      std::pair<mojom::TextInputClientPtr, mojom::InputMethodRequest>;
-  std::queue<PendingRequest> pending_requests_;
+  struct PendingRequest {
+    PendingRequest(mojom::TextInputClientInformationPtr client_info,
+                   mojom::TextInputClientPtr client,
+                   mojom::InputMethodRequest input_method_request);
+    ~PendingRequest();
+    mojom::TextInputClientInformationPtr client_info;
+    mojom::TextInputClientPtr client;
+    mojom::InputMethodRequest input_method_request;
+  };
+  std::queue<std::unique_ptr<PendingRequest>> pending_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(IMEServerImpl);
 };