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

Unified Diff: mojo/shell/view_manager_loader.cc

Issue 423963004: First cut at "content handling" support in Mojo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Create a dedicated demo app instead of using wget Created 6 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/view_manager_loader.cc
diff --git a/mojo/shell/view_manager_loader.cc b/mojo/shell/view_manager_loader.cc
index bbcca5ae64042635cb2471baf47f411b534f8f6f..870344ef79a63aa37ce6b3223b6be7b30c657a4a 100644
--- a/mojo/shell/view_manager_loader.cc
+++ b/mojo/shell/view_manager_loader.cc
@@ -23,7 +23,12 @@ ViewManagerLoader::~ViewManagerLoader() {
void ViewManagerLoader::LoadService(
ServiceManager* manager,
const GURL& url,
- ScopedMessagePipeHandle shell_handle) {
+ scoped_refptr<LoadServiceCallbacks> callbacks) {
+ ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
+ if (!shell_handle.is_valid()) {
+ return;
+ }
+
// TODO(sky): this needs some sort of authentication as well as making sure
// we only ever have one active at a time.
scoped_ptr<ApplicationImpl> app(

Powered by Google App Engine
This is Rietveld 408576698