Shell / ShellClient -> ServiceProvider

mojo/public/cpp/shell/application.h

Index: mojo/public/cpp/shell/application.h
diff --git a/mojo/public/cpp/shell/application.h b/mojo/public/cpp/shell/application.h
deleted file mode 100644
index 3e016d18114c45b15ee26a15137fd7b3564fb052..0000000000000000000000000000000000000000
--- a/mojo/public/cpp/shell/application.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// 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_SHELL_APPLICATION_H_
-#define MOJO_PUBLIC_SHELL_APPLICATION_H_
-
-#include <vector>
-
-#include "mojo/public/cpp/shell/connect.h"
-#include "mojo/public/cpp/shell/lib/service_connector.h"
-#include "mojo/public/cpp/system/core.h"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
-
-namespace mojo {
-
-// Utility class for creating ShellClients that vend service instances.
-// To use define a class that implements your specific server api, e.g. FooImpl
-// to implement a service named Foo.
-// That class must subclass an InterfaceImpl specialization.
-//
-// If there is context that is to be shared amongst all instances, define a
-// constructor with that class as its only argument, otherwise define an empty
-// constructor.
-//
-// class FooImpl : public InterfaceImpl<Foo> {
-//  public:
-//   FooImpl() {}
-// };
-//
-// or
-//
-// class BarImpl : public InterfaceImpl<Bar> {
-//  public:
-//   // context will remain valid for the lifetime of BarImpl.
-//   BarImpl(BarContext* context) : context_(context) {}
-//  private:
-//   BarContext* context;
-// };
-//
-// Create an Application instance that collects any service implementations.
-//
-// Application app(shell_handle);
-// app.AddService<FooImpl>();
-//
-// BarContext context;
-// app.AddService<BarImpl>(&context);
-//
-//
-class Application : public internal::ServiceConnectorBase::Owner {
- public:
-  explicit Application(ScopedMessagePipeHandle shell_handle);
-  explicit Application(MojoHandle shell_handle);
-  virtual ~Application();
-
-  template <typename Impl, typename Context>
-  void AddService(Context* context) {
-    AddServiceConnector(new internal::ServiceConnector<Impl, Context>(context));
-  }
-
-  template <typename Impl>
-  void AddService() {
-    AddServiceConnector(new internal::ServiceConnector<Impl, void>(NULL));
-  }
-
-  template <typename Interface>
-  void ConnectTo(const std::string& url, InterfacePtr<Interface>* ptr) {
-    mojo::ConnectTo(shell(), url, ptr);
-  }
-
- protected:
-  // ShellClient methods.
-  // Override this to dispatch to correct service when there's more than one.
-  // TODO(davemoore): Augment this with name registration.
-  virtual void AcceptConnection(const mojo::String& url,
-                                ScopedMessagePipeHandle client_handle)
-      MOJO_OVERRIDE;
-
- private:
-  // internal::ServiceConnectorBase::Owner methods.
-  // Takes ownership of |service_connector|.
-  virtual void AddServiceConnector(
-      internal::ServiceConnectorBase* service_connector) MOJO_OVERRIDE;
-  virtual void RemoveServiceConnector(
-      internal::ServiceConnectorBase* service_connector) MOJO_OVERRIDE;
-
-  typedef std::vector<internal::ServiceConnectorBase*> ServiceConnectorList;
-  ServiceConnectorList service_connectors_;
-};
-
-}  // namespace mojo
-
-#endif  // MOJO_PUBLIC_SHELL_APPLICATION_H_