Shell / ShellClient -> ServiceProvider

mojo/public/cpp/application/lib/service_connector.h

 // Copyright 2014 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 MOJO_PUBLIC_CPP_SHELL_LIB_SERVICE_CONNECTOR_H_
-#define MOJO_PUBLIC_CPP_SHELL_LIB_SERVICE_CONNECTOR_H_
+#ifndef MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_H_
+#define MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_H_
 
 #include <assert.h>
 
 #include <vector>
 
 #include "mojo/public/cpp/bindings/allocation_scope.h"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 
 namespace mojo {
 namespace internal {
 
 template <class ServiceImpl, typename Context>
 class ServiceConnector;
 
 // Specialization of ServiceConnection.
 // ServiceImpl: Subclass of InterfaceImpl<...>.
 // Context: Type of shared context.
@@ skipping 30 matching lines @@
 template <typename ServiceImpl>
 struct ServiceConstructor<ServiceImpl, void> {
  public:
   static ServiceConnection<ServiceImpl, void>* New(void* context) {
     return new ServiceConnection<ServiceImpl, void>();
   }
 };
 
 class ServiceConnectorBase {
  public:
-  class Owner : public ShellClient {
+  class Owner : public ServiceProvider {
    public:
-    Owner(ScopedMessagePipeHandle shell_handle);
+    Owner(ScopedMessagePipeHandle service_provider_handle);
     virtual ~Owner();
-    Shell* shell() { return shell_.get(); }
+    ServiceProvider* service_provider() { return service_provider_.get(); }
     virtual void AddServiceConnector(
         internal::ServiceConnectorBase* service_connector) = 0;
     virtual void RemoveServiceConnector(
         internal::ServiceConnectorBase* service_connector) = 0;
 
    protected:
     void set_service_connector_owner(ServiceConnectorBase* service_connector,
                                      Owner* owner) {
       service_connector->owner_ = owner;
     }
-    ShellPtr shell_;
+    ServiceProviderPtr service_provider_;
   };
   ServiceConnectorBase() : owner_(NULL) {}
   virtual ~ServiceConnectorBase();
-  Shell* shell() { return owner_->shell(); }
-  virtual void AcceptConnection(const std::string& url,
+  ServiceProvider* service_provider() { return owner_->service_provider(); }
+  virtual void ConnectToService(const std::string& url,
                                 ScopedMessagePipeHandle client_handle) = 0;
 
  protected:
   Owner* owner_;
 };
 
 template <class ServiceImpl, typename Context=void>
 class ServiceConnector : public internal::ServiceConnectorBase {
  public:
   ServiceConnector(Context* context = NULL) : context_(context) {}
 
   virtual ~ServiceConnector() {
     ConnectionList doomed;
     doomed.swap(connections_);
     for (typename ConnectionList::iterator it = doomed.begin();
          it != doomed.end(); ++it) {
       delete *it;
     }
     assert(connections_.empty());  // No one should have added more!
   }
 
-  virtual void AcceptConnection(const std::string& url,
+  virtual void ConnectToService(const std::string& url,
                                 ScopedMessagePipeHandle handle) MOJO_OVERRIDE {
     ServiceConnection<ServiceImpl, Context>* impl =
         ServiceConstructor<ServiceImpl, Context>::New(context_);
     impl->set_service_connector(this);
     BindToPipe(impl, handle.Pass());
 
     connections_.push_back(impl);
   }
 
   void RemoveConnection(ServiceImpl* impl) {
@@ skipping 14 matching lines @@
 
  private:
   typedef std::vector<ServiceImpl*> ConnectionList;
   ConnectionList connections_;
   Context* context_;
 };
 
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_CPP_SHELL_LIB_SERVICE_CONNECTOR_H_
+#endif  // MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_H_