Eliminate Quit() from Shell, and roll Shell & Connector together.

mojo/shell/application_instance.h

 // Copyright 2015 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_APPLICATION_INSTANCE_H_
 #define MOJO_SHELL_APPLICATION_INSTANCE_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 12 matching lines @@
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 
 class ApplicationManager;
 class NativeRunner;
 
 // Encapsulates a connection to an instance of an application, tracked by the
 // shell's ApplicationManager.
-class ApplicationInstance : public mojom::Shell,
-                            public mojom::Connector,
+class ApplicationInstance : public mojom::Connector,
                             public mojom::PIDReceiver {
  public:
   ApplicationInstance(
       mojom::ShellClientPtr shell_client,
       ApplicationManager* manager,
       const Identity& identity);
   ~ApplicationInstance() override;
 
   void InitializeApplication();
 
   void ConnectToClient(scoped_ptr<ConnectParams> params);
 
   // Required before GetProcessId can be called.
   void SetNativeRunner(NativeRunner* native_runner);
 
   void BindPIDReceiver(InterfaceRequest<mojom::PIDReceiver> pid_receiver);
 
   mojom::ShellClient* shell_client() { return shell_client_.get(); }
   const Identity& identity() const { return identity_; }
   uint32_t id() const { return id_; }
   base::ProcessId pid() const { return pid_; }
   void set_pid(base::ProcessId pid) { pid_ = pid; }
 
  private:
-  // Shell implementation:
-  void GetConnector(mojom::ConnectorRequest request) override;
-  void QuitApplication() override;
-
   // Connector implementation:
   void Connect(const String& app_url,
                uint32_t user_id,
                shell::mojom::InterfaceProviderRequest remote_interfaces,
                shell::mojom::InterfaceProviderPtr local_interfaces,
                const ConnectCallback& callback) override;
   void Clone(mojom::ConnectorRequest request) override;
 
   // PIDReceiver implementation:
   void SetPID(uint32_t pid) override;
 
   uint32_t GenerateUniqueID() const;
 
-  void CallAcceptConnection(scoped_ptr<ConnectParams> params);
-
-  void OnConnectionError();
-
-  void OnQuitRequestedResult(bool can_quit);
-
-  void DestroyRunner();
-
   ApplicationManager* const manager_;
   // An id that identifies this instance. Distinct from pid, as a single process
   // may vend multiple application instances, and this object may exist before a
   // process is launched.
   const uint32_t id_;
   const Identity identity_;
   const bool allow_any_application_;
   mojom::ShellClientPtr shell_client_;
-  Binding<mojom::Shell> binding_;
   Binding<mojom::PIDReceiver> pid_receiver_binding_;
   BindingSet<mojom::Connector> connectors_;
-  bool queue_requests_;
-  std::vector<ConnectParams*> queued_client_requests_;
   NativeRunner* native_runner_;
   base::ProcessId pid_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationInstance);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_APPLICATION_INSTANCE_H_