ShellClient -> Service

services/shell/public/cpp/connector.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_SHELL_PUBLIC_CPP_CONNECTOR_H_
 #define SERVICES_SHELL_PUBLIC_CPP_CONNECTOR_H_
 
 #include <memory>
 
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/identity.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/shell/public/interfaces/service.mojom.h"
 #include "services/shell/public/interfaces/shell.mojom.h"
-#include "services/shell/public/interfaces/shell_client.mojom.h"
 
 namespace shell {
 
 // An interface that encapsulates the Mojo Shell's broker interface by which
 // connections between applications are established. Once Connect() is called,
 // this class is bound to the thread the call was made on and it cannot be
 // passed to another thread without calling Clone().
 // An instance of this class is created internally by ShellConnection for use
 // on the thread ShellConnection is instantiated on, and this interface is
 // wrapped by the Shell interface.
@@ skipping 10 matching lines @@
 
   class ConnectParams {
    public:
     explicit ConnectParams(const Identity& target);
     explicit ConnectParams(const std::string& name);
     ~ConnectParams();
 
     const Identity& target() { return target_; }
     void set_target(const Identity& target) { target_ = target; }
     void set_client_process_connection(
-        mojom::ShellClientPtr shell_client,
+        mojom::ServicePtr service,
         mojom::PIDReceiverRequest pid_receiver_request) {
-      shell_client_ = std::move(shell_client);
+      service_ = std::move(service);
       pid_receiver_request_ = std::move(pid_receiver_request);
     }
     void TakeClientProcessConnection(
-        mojom::ShellClientPtr* shell_client,
+        mojom::ServicePtr* service,
         mojom::PIDReceiverRequest* pid_receiver_request) {
-      *shell_client = std::move(shell_client_);
+      *service = std::move(service_);
       *pid_receiver_request = std::move(pid_receiver_request_);
     }
     InterfaceRegistry* exposed_interfaces() { return exposed_interfaces_; }
     void set_exposed_interfaces(InterfaceRegistry* exposed_interfaces) {
       exposed_interfaces_ = exposed_interfaces;
     }
     InterfaceProvider* remote_interfaces() { return remote_interfaces_; }
     void set_remote_interfaces(InterfaceProvider* remote_interfaces) {
       remote_interfaces_ = remote_interfaces;
     }
 
    private:
     Identity target_;
-    mojom::ShellClientPtr shell_client_;
+    mojom::ServicePtr service_;
     mojom::PIDReceiverRequest pid_receiver_request_;
     InterfaceRegistry* exposed_interfaces_ = nullptr;
     InterfaceProvider* remote_interfaces_ = nullptr;
 
     DISALLOW_COPY_AND_ASSIGN(ConnectParams);
   };
 
   // Requests a new connection to an application. Returns a pointer to the
   // connection if the connection is permitted by this application's delegate,
   // or nullptr otherwise. Caller takes ownership.
@@ skipping 27 matching lines @@
 
   // Creates a new instance of this class which may be passed to another thread.
   // The returned object may be passed multiple times until Connect() is called,
   // at which point this method must be called again to pass again.
   virtual std::unique_ptr<Connector> Clone() = 0;
 };
 
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_CONNECTOR_H_