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

Unified Diff: mojo/shell/context.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: 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/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 5771fb6693ea768a77088d294f56e073c5decad5..4199f04e66e91ce96934209a1a301c85d2bbf96e 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -138,10 +138,10 @@ class Context::NativeViewportApplicationLoader
// ApplicationLoader implementation.
virtual void Load(ApplicationManager* manager,
const GURL& url,
+ ScopedMessagePipeHandle shell_handle,
scoped_refptr<LoadCallbacks> callbacks) override {
- ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
- if (shell_handle.is_valid())
- app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
+ DCHECK(shell_handle.is_valid());
+ app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
}
virtual void OnApplicationError(ApplicationManager* manager,

Powered by Google App Engine
This is Rietveld 408576698