Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1280)

Unified Diff: mojo/application_manager/application_manager.h

Issue 741453002: Make sure that Content Handled application can be connected multiple times. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Follow review Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/application_manager/application_manager.h
diff --git a/mojo/application_manager/application_manager.h b/mojo/application_manager/application_manager.h
index 84ad9c40958f63ccdf5ad6726a7df23da8a0bba3..58644e6d746a1dcbbe83c39591cc8dd41ccea4d8 100644
--- a/mojo/application_manager/application_manager.h
+++ b/mojo/application_manager/application_manager.h
@@ -109,7 +109,6 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
};
class ContentHandlerConnection;
- class LoadCallbacksImpl;
class ShellImpl;
typedef std::map<std::string, ApplicationLoader*> SchemeToLoaderMap;
@@ -129,18 +128,9 @@ class MOJO_APPLICATION_MANAGER_EXPORT ApplicationManager {
const GURL& requestor_url,
ServiceProviderPtr service_provider);
- void RegisterLoadedApplication(const GURL& requested_url,
- const GURL& resolved_url,
- const GURL& requestor_url,
- ServiceProviderPtr service_provider,
- ScopedMessagePipeHandle* shell_handle);
-
- void LoadWithContentHandler(const GURL& requested_url,
- const GURL& resolved_url,
- const GURL& requestor_url,
- const GURL& content_handler_url,
- URLResponsePtr url_response,
- ServiceProviderPtr service_provider);
+ void LoadWithContentHandler(const GURL& content_handler_url,
+ ScopedMessagePipeHandle shell_handle,
+ URLResponsePtr url_response);
// Return the appropriate loader for |url|. This can return NULL if there is
// no default loader configured.

Powered by Google App Engine
This is Rietveld 408576698