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

Unified Diff: mojo/shell/application_manager.h

Issue 1229903003: Mandoline: Implement basic "process per site" support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months 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/shell/application_manager.h
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index 5733b6b77f99c8f7f690958d02a56929da85ebb2..6aa4454ef2f9d5a2ad3e0e3e428d7e6cf69d7d17 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -15,6 +15,7 @@
#include "mojo/application/public/interfaces/service_provider.mojom.h"
#include "mojo/public/cpp/bindings/interface_ptr_info.h"
#include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/services/network/public/interfaces/network_service.mojom.h"
#include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
#include "mojo/services/updater/updater.mojom.h"
#include "mojo/shell/application_loader.h"
@@ -213,9 +214,9 @@ class ApplicationManager {
void LoadWithContentHandler(const GURL& content_handler_url,
const GURL& requestor_url,
- const std::string& qualifier,
InterfaceRequest<Application> application_request,
- URLResponsePtr url_response);
+ URLResponsePtr url_response,
+ const std::string& qualifier);
// Returns the appropriate loader for |url|, or null if there is no loader
// configured for the URL.
@@ -242,6 +243,7 @@ class ApplicationManager {
updater::UpdaterPtr updater_;
MimeTypeToURLMap mime_type_to_url_;
ScopedVector<NativeRunner> native_runners_;
+ NetworkServicePtr network_service_;
bool disable_cache_;
base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698