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

mojo/shell/public/interfaces/shell_client.mojom

 // 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.
 
 module mojo.shell.mojom;
 
 import "mojo/shell/public/interfaces/interface_provider.mojom";
 import "mojo/shell/public/interfaces/shell.mojom";
 
 // Implemented by something "known to" the Mojo Shell (e.g. an application or
 // service), for which an instance is tracked. It allows the implementor to
 // receive lifecycle events and service inbound connection attempts.
 interface ShellClient {
   // Called by the shell once an instance for this application has been created.
   // This method will be called exactly once before any other method is called.
   //
   // Parameters:
   //
-  //  shell
+  //  connector
   //    An interface back to the shell by which new connections may be
   //    established.
   //
   //  url
   //    The resolved URL used in the connection request that resulted in this
   //    application being initialized.
   //
   //  id
   //    A unique identifier used by the shell to identify this instance.
   //
   //  user_id
   //    Identifies the user this instance is run as in the shell. This may
   //    differ from the user the application that caused this application to be
   //    instantiated is run as. This will always be a valid user id, never
   //    Shell::kUserInherit.
   //
-  Initialize(Shell shell, string url, uint32 id, uint32 user_id);
+  Initialize(Connector connector, string url, uint32 id, uint32 user_id);
 
   // Called when another application attempts to open a connection to this
   // application. An application implements this method to complete the exchange
   // of interface implementations with the remote application. See also
   // documentation in shell.mojom for Connect(). The application originating
   // the request is referred to as the "source" and the one receiving the
   // "target".
   //
   // Parameters:
   //
@@ skipping 27 matching lines @@
   //  resolved_url
   //    The resolved URL used to complete this connection.
   //
   AcceptConnection(string requestor_url,
                    uint32 requestor_id,
                    uint32 requestor_user_id,
                    InterfaceProvider&? local_interfaces,
                    InterfaceProvider? remote_interfaces,
                    array<string> allowed_interfaces,
                    string resolved_url);
-
-  // Called by the shell in response to calling Shell's QuitApplication. The
-  // application should run the callback with true if shutdown can proceed.
-  // See Shell::QuitApplication for details about shutdown workflow.
-  OnQuitRequested() => (bool can_quit);
 };