| Index: third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc
|
| diff --git a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc
|
| index cfa2b79662c2b1f4210b169765487ab5b6015da6..be4463c8a8a8c412974b71cc79bb0401e49fe85e 100644
|
| --- a/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc
|
| +++ b/third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager_client_factory.cc
|
| @@ -21,14 +21,12 @@
|
| // static
|
| scoped_ptr<ViewManagerClient>
|
| ViewManagerClientFactory::WeakBindViewManagerToPipe(
|
| - InterfaceRequest<ViewManagerClient> request,
|
| - ViewManagerServicePtr view_manager_service,
|
| + ScopedMessagePipeHandle handle,
|
| Shell* shell,
|
| ViewManagerDelegate* delegate) {
|
| const bool delete_on_error = false;
|
| scoped_ptr<ViewManagerClientImpl> client(new ViewManagerClientImpl(
|
| - delegate, shell, request.Pass(), delete_on_error));
|
| - client->SetViewManagerService(view_manager_service.Pass());
|
| + delegate, shell, handle.Pass(), delete_on_error));
|
| return client.Pass();
|
| }
|
|
|
| @@ -37,7 +35,8 @@
|
| ApplicationConnection* connection,
|
| InterfaceRequest<ViewManagerClient> request) {
|
| const bool delete_on_error = true;
|
| - new ViewManagerClientImpl(delegate_, shell_, request.Pass(), delete_on_error);
|
| + new ViewManagerClientImpl(delegate_, shell_, request.PassMessagePipe(),
|
| + delete_on_error);
|
| }
|
|
|
| } // namespace mojo
|
|
|