Simplify the ApplicationLoader interface in preparation for changes.

shell/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 SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 61 matching lines @@
 
   void RegisterExternalApplication(const GURL& application_url,
                                    const std::vector<std::string>& args,
                                    ApplicationPtr application);
 
   // 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();
   }
+  void set_native_application_loader(
+      scoped_ptr<NativeApplicationLoader> loader) {
+    native_application_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);
   // These strings will be passed to the Initialize() method when an
   // Application is instantiated.
   void SetArgsForURL(const std::vector<std::string>& args, const GURL& url);
 
   // Destroys all Shell-ends of connections established with Applications.
   // Applications connected by this ApplicationManager will observe pipe errors
   // and have a chance to shutdown.
   void TerminateShellConnections();
 
   // Removes a ShellImpl when it encounters an error.
   void OnShellImplError(ShellImpl* shell_impl);
 
  private:
-  enum IncludeDefaultLoader {
-    INCLUDE_DEFAULT_LOADER,
-    DONT_INCLUDE_DEFAULT_LOADER,
-  };
-
   class ContentHandlerConnection;
 
   typedef std::map<std::string, ApplicationLoader*> SchemeToLoaderMap;
   typedef std::map<GURL, ApplicationLoader*> URLToLoaderMap;
   typedef std::map<GURL, ShellImpl*> URLToShellImplMap;
   typedef std::map<GURL, ContentHandlerConnection*> URLToContentHandlerMap;
   typedef std::map<GURL, std::vector<std::string>> URLToArgsMap;
 
-  void ConnectToApplicationImpl(const GURL& requested_url,
-                                const GURL& resolved_url,
-                                const GURL& requestor_url,
-                                InterfaceRequest<ServiceProvider> services,
-                                ServiceProviderPtr exposed_services,
-                                ApplicationLoader* loader);
+  bool ConnectToRunningApplication(const GURL& application_url,
+                                   const GURL& requestor_url,
+                                   InterfaceRequest<ServiceProvider>* services,
+                                   ServiceProviderPtr* exposed_services);
+
+  bool ConnectToApplicationWithLoader(
+      const GURL& requested_url,
+      const GURL& resolved_url,
+      const GURL& requestor_url,
+      InterfaceRequest<ServiceProvider>* services,
+      ServiceProviderPtr* exposed_services,
+      ApplicationLoader* loader);
+
+  InterfaceRequest<Application> RegisterShell(
+      const GURL& requested_url,
+      const GURL& resolved_url,
+      const GURL& requestor_url,
+      InterfaceRequest<ServiceProvider> services,
+      ServiceProviderPtr exposed_services);
 
   ShellImpl* GetShellImpl(const GURL& url);
 
   void ConnectToClient(ShellImpl* shell_impl,
                        const GURL& url,
                        const GURL& requestor_url,
                        InterfaceRequest<ServiceProvider> services,
                        ServiceProviderPtr exposed_services);
 
   void LoadWithContentHandler(const GURL& content_handler_url,
                               InterfaceRequest<Application> application_request,
                               URLResponsePtr url_response);
 
   // Return the appropriate loader for |url|. This can return NULL if there is
-  // no default loader configured.
-  ApplicationLoader* GetLoaderForURL(const GURL& url,
-                                     IncludeDefaultLoader fallback);
+  // no loader configured for the URL.
+  ApplicationLoader* GetLoaderForURL(const GURL& url);
 
   // Removes a ContentHandler when it encounters an error.
   void OnContentHandlerError(ContentHandlerConnection* content_handler);
 
   // Returns the arguments for the given url.
   Array<String> GetArgsForURL(const GURL& url);
 
   Delegate* delegate_;
   // Loader management.
+  // Loaders are chosen in the order they are listed here.
   URLToLoaderMap url_to_loader_;
   SchemeToLoaderMap scheme_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
+  scoped_ptr<NativeApplicationLoader> native_application_loader_;
 
   URLToShellImplMap url_to_shell_impl_;
   URLToContentHandlerMap url_to_content_handler_;
   URLToArgsMap url_to_args_;
 
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace mojo
 
 #endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_