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

Unified Diff: mojo/shell/network_application_loader.cc

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: Fix sky 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
« no previous file with comments | « mojo/shell/network_application_loader.h ('k') | mojo/shell/ui_application_loader_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/network_application_loader.cc
diff --git a/mojo/shell/network_application_loader.cc b/mojo/shell/network_application_loader.cc
index dbe70b767c00fd1fef0950fe1d5852a517da7fc9..6a2c519b160f879be54ae9f73acb5ff53db6d1b3 100644
--- a/mojo/shell/network_application_loader.cc
+++ b/mojo/shell/network_application_loader.cc
@@ -31,11 +31,9 @@ NetworkApplicationLoader::~NetworkApplicationLoader() {
void NetworkApplicationLoader::Load(ApplicationManager* manager,
const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) {
- ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
- if (!shell_handle.is_valid())
- return;
-
+ ScopedMessagePipeHandle shell_handle,
+ LoadCallback callback) {
+ DCHECK(shell_handle.is_valid());
uintptr_t key = reinterpret_cast<uintptr_t>(manager);
if (apps_.find(key) == apps_.end()) {
scoped_ptr<ApplicationImpl> app(
« no previous file with comments | « mojo/shell/network_application_loader.h ('k') | mojo/shell/ui_application_loader_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698