Simplify the ApplicationLoader interface in preparation for changes.

shell/application_manager/application_loader.h

Index: shell/application_manager/application_loader.h
diff --git a/shell/application_manager/application_loader.h b/shell/application_manager/application_loader.h
index b081819cd80e614fd6c9994f776d9dc760121493..c27fa5f539eef5ea534ef59c1882ee0b37233f99 100644
--- a/shell/application_manager/application_loader.h
+++ b/shell/application_manager/application_loader.h
@@ -17,36 +17,14 @@ namespace mojo {
 class Application;
 class ApplicationManager;
 
-// Interface to allowing loading behavior to be established for schemes,
-// specific urls or as the default.
-// A ApplicationLoader is responsible to using whatever mechanism is appropriate
-// to load the application at url.
-// The handle to the shell is passed to that application so it can bind it to
-// a Shell instance. This will give the Application a way to connect to other
-// apps and services.
+// Interface to implement special application loading behavior for a particular
+// URL or scheme.
 class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader {
  public:
-  typedef base::Callback<void(const GURL& content_handler_url,
-                              InterfaceRequest<Application> application_request,
-                              URLResponsePtr url_request)> LoadCallback;
   virtual ~ApplicationLoader() {}
 
-  // Returns a callback that will should never be called.
-  static LoadCallback SimpleLoadCallback();
-
-  // Load the application named |url|. Applications can be loaded two ways:
-  //
-  // 1. |url| can refer directly to a Mojo application. In this case,
-  //    shell_handle should be used to implement the mojo.Application interface.
-  //
-  // 2. |url| can refer to some content that can be handled by some other Mojo
-  //    application. In this case, call callbacks and specify the URL of the
-  //    application that should handle the content.  The specified application
-  //    must implement the mojo.ContentHandler interface.
-  virtual void Load(ApplicationManager* application_manager,
-                    const GURL& url,
-                    InterfaceRequest<Application> application_request,
-                    LoadCallback callback) = 0;
+  virtual void Load(const GURL& url,
+                    InterfaceRequest<Application> application_request) = 0;
 
   // Called when the Application exits.
   virtual void OnApplicationError(ApplicationManager* manager,
@@ -56,6 +34,26 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationLoader {
   ApplicationLoader() {}
 };
 
+// TODO(aa): Remove this temporary interface. This is just here as a stepping
+// stone, until I can tear apart DynamicApplicationLoader into smaller pieces.
+// See comments at top of shell/dynamic_application_loader.h.
+
+typedef base::Callback<void(const GURL& content_handler_url,
+                            InterfaceRequest<Application> application_request,
+                            URLResponsePtr url_request)> LoadCallback;
+
+class MOJO_APPLICATION_MANAGER_EXPORT DynamicApplicationLoader {

[qsr, 2015/02/19 09:25:01]

As this is temporary, do you want to rename this or the other? Having 2
DynamicApplicationLoader makes it a little bit harder to follow which is which.
I guess calling the other DynamicApplicationLoaderImpl might help. WDYT?

Also, can we get rid of all the _EXPORT?

[DaveMoore, 2015/02/19 18:58:31]

Maybe the word "Dynamic" is all wrong. What we're really loading is a
NativeApplication (in our .gn files we call them mojo_native_application). Could
we move towards that sort of naming?

[Aaron Boodman, 2015/02/19 20:38:46]

Done.

[Aaron Boodman, 2015/02/19 20:38:46]

Done.

+ public:
+  // Returns a callback that will should never be called.

[qsr, 2015/02/19 09:25:01]

s/will //

[Aaron Boodman, 2015/02/19 20:38:46]

Done.

+  static LoadCallback SimpleLoadCallback();
+
+  virtual ~DynamicApplicationLoader() {}
+
+  virtual void Load(const GURL& url,
+                    InterfaceRequest<Application> application_request,
+                    LoadCallback callback) {}
+};
+
 }  // namespace mojo
 
 #endif  // SHELL_APPLICATION_MANAGER_APPLICATION_LOADER_H_