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

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: 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
Index: mojo/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index fab5a6a56e296b7cf360b15d60b09b8f735d99e4..90b296c52fd4ac856b3900ea5348f9aa82b80686 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -134,10 +134,10 @@ class Context::NativeViewportApplicationLoader
// ApplicationLoader implementation.
virtual void Load(ApplicationManager* manager,
const GURL& url,
- scoped_refptr<LoadCallbacks> callbacks) override {
- ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
- if (shell_handle.is_valid())
- app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
+ ScopedMessagePipeHandle shell_handle,
+ LoadCallback callback) override {
+ DCHECK(shell_handle.is_valid());
+ app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
}
virtual void OnApplicationError(ApplicationManager* manager,
« no previous file with comments | « mojo/services/window_manager/window_manager_api_unittest.cc ('k') | mojo/shell/dynamic_application_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698