| Index: trunk/src/mojo/shell/view_manager_loader.cc
|
| ===================================================================
|
| --- trunk/src/mojo/shell/view_manager_loader.cc (revision 288042)
|
| +++ trunk/src/mojo/shell/view_manager_loader.cc (working copy)
|
| @@ -20,13 +20,10 @@
|
| ViewManagerLoader::~ViewManagerLoader() {
|
| }
|
|
|
| -void ViewManagerLoader::Load(ServiceManager* manager,
|
| - const GURL& url,
|
| - scoped_refptr<LoadCallbacks> callbacks) {
|
| - ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
|
| - if (!shell_handle.is_valid())
|
| - return;
|
| -
|
| +void ViewManagerLoader::LoadService(
|
| + ServiceManager* manager,
|
| + const GURL& url,
|
| + ScopedMessagePipeHandle shell_handle) {
|
| // 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(
|
|
|