IME for Mus: Send TextInputClient information to IMEDriver.

services/ui/ime/ime_server_impl.h

 // 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.
 
 #ifndef SERVICES_UI_IME_IME_SERVER_IMPL_H_
 #define SERVICES_UI_IME_IME_SERVER_IMPL_H_
 
 #include <utility>
 
 #include "mojo/public/cpp/bindings/binding_set.h"
@@ skipping 10 matching lines @@
  public:
   IMEServerImpl();
   ~IMEServerImpl() override;
 
   void Init(service_manager::Connector* connector, bool is_test_config);
   void AddBinding(mojom::IMEServerRequest request);
   void OnDriverChanged(mojom::IMEDriverPtr driver);
 
  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);
 
   service_manager::Connector* connector_;
   catalog::mojom::CatalogPtr catalog_;
   mojo::BindingSet<mojom::IMEServer> bindings_;
   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);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_IME_IME_SERVER_IMPL_H_