Get rid of KeepAlive. Quit shell when all urls run directly by Context are closed.

mojo/application_manager/application_manager.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_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 #define MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/application_manager/application_manager_export.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
 
 class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
  public:
+  class Delegate {
+   public:
+    virtual void OnServiceError(const GURL& url) = 0;

[tim (not reviewing), 2014/08/23 00:14:26]

Please add a comment describing what a service error means here. Also, should
this be OnApplicationError?

[DaveMoore, 2014/08/24 22:31:11]

Done and Done.

+  };

[tim (not reviewing), 2014/08/23 00:14:27]

Should have a virtual ~Delegate... (protected: if you like).

[DaveMoore, 2014/08/24 22:31:11]

Done.

+
   // API for testing.
   class MOJO_APPLICATION_MANAGER_EXPORT TestAPI {
    public:
     explicit TestAPI(ApplicationManager* manager);
     ~TestAPI();
 
     // Returns true if the shared instance has been created.
     static bool HasCreatedInstance();
     // Returns true if there is a ShellImpl for this URL.
     bool HasFactoryForURL(const GURL& url) const;
@@ skipping 30 matching lines @@
                                InterfacePtr<Interface>* ptr) {
     ScopedMessagePipeHandle service_handle =
         ConnectToServiceByName(application_url, Interface::Name_);
     ptr->Bind(service_handle.Pass());
   }
 
   ScopedMessagePipeHandle ConnectToServiceByName(
       const GURL& application_url,
       const std::string& interface_name);
 
+  void set_delegate(Delegate* delegate) { delegate_ = delegate; }

[tim (not reviewing), 2014/08/23 00:14:27]

Do we need to support the NULL-delegate case or could this be a constructor
parameter?

[DaveMoore, 2014/08/24 22:31:11]

I don't think so. It's up to the creator of the ApplicationManager to decide if
they want to respond to
errors or not.
On 2014/08/23 00:14:27, timsteele wrote:

+
   // Sets the default Loader to be used if not overridden by SetLoaderForURL()
   // or SetLoaderForScheme().
   void set_default_loader(scoped_ptr<ApplicationLoader> loader) {
     default_loader_ = loader.Pass();
   }
   // Sets a Loader to be used for a specific url.
   void SetLoaderForURL(scoped_ptr<ApplicationLoader> loader, const GURL& url);
   // Sets a Loader to be used for a specific url scheme.
   void SetLoaderForScheme(scoped_ptr<ApplicationLoader> loader,
                           const std::string& scheme);
@@ skipping 32 matching lines @@
                               ServiceProviderPtr service_provider);
 
   // Returns the Loader to use for a url (using default if not overridden.)
   // The preference is to use a loader that's been specified for an url first,
   // then one that's been specified for a scheme, then the default.
   ApplicationLoader* GetLoaderForURL(const GURL& url);
 
   // Removes a ShellImpl when it encounters an error.
   void OnShellImplError(ShellImpl* shell_impl);
 
+  Delegate* delegate_;
   // Loader management.
   URLToLoaderMap url_to_loader_;
   SchemeToLoaderMap scheme_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
   Interceptor* interceptor_;
 
   URLToShellImplMap url_to_shell_impl_;
   URLToContentHandlerMap url_to_content_handler_;
 
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_APPLICATION_MANAGER_APPLICATION_MANAGER_H_