| Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_factory.cc
|
| diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_factory.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_client_factory.cc
|
| index 84fa87db15ed52e3c297c706fd4ef5e07a201f5e..33ce22ce3a4bddee36aa9c5155dd87d9aa091dbd 100644
|
| --- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_factory.cc
|
| +++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_factory.cc
|
| @@ -24,10 +24,9 @@ ViewManagerClientFactory::WeakBindViewManagerToPipe(
|
| ScopedMessagePipeHandle handle,
|
| Shell* shell,
|
| ViewManagerDelegate* delegate) {
|
| - scoped_ptr<ViewManagerClientImpl> client(
|
| - new ViewManagerClientImpl(delegate, shell));
|
| - WeakBindToPipe(client.get(), handle.Pass());
|
| - client->OnConnectionEstablished();
|
| + bool delete_on_error = false;
|
| + scoped_ptr<ViewManagerClientImpl> client(new ViewManagerClientImpl(
|
| + delegate, shell, handle.Pass(), delete_on_error));
|
| return client.Pass();
|
| }
|
|
|
| @@ -35,9 +34,9 @@ ViewManagerClientFactory::WeakBindViewManagerToPipe(
|
| void ViewManagerClientFactory::Create(
|
| ApplicationConnection* connection,
|
| InterfaceRequest<ViewManagerClient> request) {
|
| - ViewManagerClientImpl* impl =
|
| - BindToRequest(new ViewManagerClientImpl(delegate_, shell_), &request);
|
| - impl->OnConnectionEstablished();
|
| + bool delete_on_error = true;
|
| + new ViewManagerClientImpl(delegate_, shell_, request.PassMessagePipe(),
|
| + delete_on_error);
|
| }
|
|
|
| } // namespace mojo
|
|
|