| Index: mojo/shell/service_manager.cc
|
| diff --git a/mojo/shell/service_manager.cc b/mojo/shell/service_manager.cc
|
| index cea78daade0ffbcb55fbb709a115b58337ff76f1..55fd41f04df08cbce22b6d548767f07328bfd203 100644
|
| --- a/mojo/shell/service_manager.cc
|
| +++ b/mojo/shell/service_manager.cc
|
| @@ -11,14 +11,13 @@
|
| namespace mojo {
|
| namespace shell {
|
|
|
| -class ServiceManager::Service : public ShellStub {
|
| +class ServiceManager::Service : public Shell {
|
| public:
|
| Service(ServiceManager* manager, const GURL& url)
|
| : manager_(manager),
|
| url_(url) {
|
| MessagePipe pipe;
|
| - shell_client_.reset(pipe.handle0.Pass());
|
| - shell_client_.SetPeer(this);
|
| + shell_client_.reset(pipe.handle0.Pass(), this);
|
| manager_->GetLoaderForURL(url)->Load(url, pipe.handle1.Pass());
|
| }
|
| virtual ~Service() {}
|
|
|