Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

mojo/shell/public/cpp/application_impl.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_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
 #define MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_
 
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/shell/public/cpp/app_lifetime_helper.h"
 #include "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/lib/service_registry.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/public/interfaces/application.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace mojo {
 
-shell::mojom::CapabilityFilterPtr CreatePermissiveCapabilityFilter();
-
-using ApplicationRequest = InterfaceRequest<shell::mojom::Application>;
-
 // TODO(beng): This comment is hilariously out of date.
 // Utility class for communicating with the Shell, and providing Services
 // to clients.
 //
 // 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
@@ skipping 14 matching lines @@
 //
 // Create an ApplicationImpl instance that collects any service implementations.
 //
 // ApplicationImpl app(service_provider_handle);
 // app.AddService<FooImpl>();
 //
 // BarContext context;
 // app.AddService<BarImpl>(&context);
 //
 //
-class ApplicationImpl : public shell::mojom::Application {
+class ApplicationImpl : public Shell, public shell::mojom::Application {
  public:
-  class ConnectParams {
-   public:
-    explicit ConnectParams(const std::string& url);
-    explicit ConnectParams(URLRequestPtr request);
-    ~ConnectParams();
-
-    URLRequestPtr TakeRequest() { return std::move(request_); }
-    shell::mojom::CapabilityFilterPtr TakeFilter() {
-      return std::move(filter_);
-    }
-    void set_filter(shell::mojom::CapabilityFilterPtr filter) {
-      filter_ = std::move(filter);
-    }
-
-   private:
-    URLRequestPtr request_;
-    shell::mojom::CapabilityFilterPtr filter_;
-
-    DISALLOW_COPY_AND_ASSIGN(ConnectParams);
-  };
-
   class TestApi {
    public:
     explicit TestApi(ApplicationImpl* application)
         : application_(application) {}
 
     void UnbindConnections(
         InterfaceRequest<shell::mojom::Application>* application_request,
         shell::mojom::ShellPtr* shell) {
       application_->UnbindConnections(application_request, shell);
     }
@@ skipping 12 matching lines @@
   ApplicationImpl(ApplicationDelegate* delegate,
                   InterfaceRequest<shell::mojom::Application> request,
                   const Closure& termination_closure);
   ~ApplicationImpl() override;
 
   // The Mojo shell. This will return a valid pointer after Initialize() has
   // been invoked. It will remain valid until UnbindConnections() is invoked or
   // the ApplicationImpl is destroyed.
   shell::mojom::Shell* shell() const { return shell_.get(); }
 
-  const std::string& url() const { return url_; }
-  uint32_t id() const { return id_; }
-
-  AppLifetimeHelper* app_lifetime_helper() { return &app_lifetime_helper_; }
-
-  // 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.
-  scoped_ptr<ApplicationConnection> ConnectToApplication(
-      const std::string& url);
-  scoped_ptr<ApplicationConnection> ConnectToApplication(ConnectParams* params);
-
-  // Connect to application identified by |request->url| and connect to the
-  // service implementation of the interface identified by |Interface|.
-  template <typename Interface>
-  void ConnectToService(ConnectParams* params, InterfacePtr<Interface>* ptr) {
-    scoped_ptr<ApplicationConnection> connection = ConnectToApplication(params);
-    if (!connection.get())
-      return;
-    connection->ConnectToService(ptr);
-  }
-  template <typename Interface>
-  void ConnectToService(const std::string& url, InterfacePtr<Interface>* ptr) {
-    ConnectParams params(url);
-    params.set_filter(CreatePermissiveCapabilityFilter());
-    return ConnectToService(&params, ptr);
-  }
-
   // Block the calling thread until the Initialize() method is called by the
   // shell.
   void WaitForInitialize();
 
-  // Initiate shutdown of this application. This may involve a round trip to the
-  // Shell to ensure there are no inbound service requests.
-  void Quit();
+  // Shell.
+  scoped_ptr<ApplicationConnection> ConnectToApplication(
+      const std::string& url) override;
+  scoped_ptr<ApplicationConnection> ConnectToApplication(
+      ConnectParams* params) override;
+  void Quit() override;
+  scoped_ptr<AppRefCount> CreateAppRefCount() override;
 
  private:
   // shell::mojom::Application implementation.
   void Initialize(shell::mojom::ShellPtr shell,
                   const mojo::String& url,
                   uint32_t id) override;
   void AcceptConnection(const String& requestor_url,
                         uint32_t requestor_id,
                         InterfaceRequest<ServiceProvider> services,
                         ServiceProviderPtr exposed_services,
@@ skipping 13 matching lines @@
   void UnbindConnections(
       InterfaceRequest<shell::mojom::Application>* application_request,
       shell::mojom::ShellPtr* shell);
 
   // We track the lifetime of incoming connection registries as it more
   // convenient for the client.
   ScopedVector<ApplicationConnection> incoming_connections_;
   ApplicationDelegate* delegate_;
   Binding<shell::mojom::Application> binding_;
   shell::mojom::ShellPtr shell_;
-  std::string url_;
-  uint32_t id_;
   Closure termination_closure_;
   AppLifetimeHelper app_lifetime_helper_;
   bool quit_requested_;
   base::WeakPtrFactory<ApplicationImpl> weak_factory_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_APPLICATION_IMPL_H_