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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/shell/network_service_loader.cc

Issue 423963004: First cut at "content handling" support in Mojo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make the tests pass Created 6 years, 4 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
« mojo/shell/dynamic_service_loader_unittest.cc ('K') | « mojo/shell/network_service_loader.h ('k') | mojo/shell/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/network_service_loader.cc
diff --git a/mojo/shell/network_service_loader.cc b/mojo/shell/network_service_loader.cc
index 9f8f87f0b7f62ada1c6a8f836e061f58797005f7..2ff365819d7990b9ad221193b0a92f7c74d16a3b 100644
--- a/mojo/shell/network_service_loader.cc
+++ b/mojo/shell/network_service_loader.cc
@@ -32,7 +32,11 @@ NetworkServiceLoader::~NetworkServiceLoader() {
void NetworkServiceLoader::LoadService(
ServiceManager* manager,
const GURL& url,
- ScopedMessagePipeHandle shell_handle) {
+ scoped_refptr<LoadServiceCallbacks> callbacks) {
+ ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
+ if (!shell_handle.is_valid())
+ return;
+
uintptr_t key = reinterpret_cast<uintptr_t>(manager);
if (apps_.find(key) == apps_.end()) {
scoped_ptr<ApplicationImpl> app(
« mojo/shell/dynamic_service_loader_unittest.cc ('K') | « mojo/shell/network_service_loader.h ('k') | mojo/shell/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698