| Index: mojo/application_manager/application_manager.h
|
| diff --git a/mojo/application_manager/application_manager.h b/mojo/application_manager/application_manager.h
|
| index 66a6c081d4d9451d64d6da77fece0cb7cfde4ca3..9eb03d1259f30be0b6e92e1773807e95cc47ecf7 100644
|
| --- a/mojo/application_manager/application_manager.h
|
| +++ b/mojo/application_manager/application_manager.h
|
| @@ -14,6 +14,7 @@
|
| #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 "mojo/services/public/interfaces/content_handler/content_handler.mojom.h"
|
| #include "url/gurl.h"
|
|
|
| namespace mojo {
|
| @@ -120,11 +121,13 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
|
| ServiceProviderPtr service_provider,
|
| ScopedMessagePipeHandle* shell_handle);
|
|
|
| - void LoadWithContentHandler(const GURL& content_url,
|
| - const GURL& requestor_url,
|
| - const GURL& content_handler_url,
|
| - URLResponsePtr content,
|
| - ServiceProviderPtr service_provider);
|
| + void LoadWithContentHandler(
|
| + const GURL& content_url,
|
| + const GURL& requestor_url,
|
| + const GURL& content_handler_url,
|
| + URLResponsePtr url_response,
|
| + URLLoaderPtr url_loader,
|
| + 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,
|
|
|