| Index: services/window_manager/window_manager_app.h
|
| diff --git a/services/window_manager/window_manager_app.h b/services/window_manager/window_manager_app.h
|
| index 56ca7b7bf95dcbcdc26f11b882f325d2ebebac88..1ac1cfef5d9d88a0eb04a199bf21fbfe8ae6a18d 100644
|
| --- a/services/window_manager/window_manager_app.h
|
| +++ b/services/window_manager/window_manager_app.h
|
| @@ -158,6 +158,8 @@ class WindowManagerApp
|
| void CreateWindowManagerForViewManagerClient(
|
| uint16_t connection_id,
|
| mojo::ScopedMessagePipeHandle window_manager_pipe) override;
|
| + void SetViewManagerClient(
|
| + mojo::ScopedMessagePipeHandle view_manager_client_request) override;
|
|
|
| mojo::Shell* shell_;
|
|
|
| @@ -168,6 +170,7 @@ class WindowManagerApp
|
| ViewManagerDelegate* wrapped_view_manager_delegate_;
|
| WindowManagerDelegate* window_manager_delegate_;
|
|
|
| + mojo::ViewManagerServicePtr view_manager_service_;
|
| scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
|
| mojo::View* root_;
|
|
|
|
|