| Index: components/mus/public/cpp/lib/window_tree_client_impl.h
|
| diff --git a/components/mus/public/cpp/lib/window_tree_client_impl.h b/components/mus/public/cpp/lib/window_tree_client_impl.h
|
| index aba82267958ada91bffc382520da6c34a99094e5..4d86feff6f10c506369fb17f68fda5da74a3bbd7 100644
|
| --- a/components/mus/public/cpp/lib/window_tree_client_impl.h
|
| +++ b/components/mus/public/cpp/lib/window_tree_client_impl.h
|
| @@ -36,7 +36,7 @@ enum class ChangeType;
|
| // Manages the connection with the Window Server service.
|
| class WindowTreeClientImpl : public WindowTreeConnection,
|
| public mojom::WindowTreeClient,
|
| - public mojom::WindowManagerInternal,
|
| + public mojom::WindowManager,
|
| public WindowManagerClient {
|
| public:
|
| WindowTreeClientImpl(WindowTreeDelegate* delegate,
|
| @@ -210,11 +210,10 @@ class WindowTreeClientImpl : public WindowTreeConnection,
|
| mojom::Cursor cursor) override;
|
| void OnChangeCompleted(uint32_t change_id, bool success) override;
|
| void RequestClose(uint32_t window_id) override;
|
| - void GetWindowManagerInternal(
|
| - mojo::AssociatedInterfaceRequest<WindowManagerInternal> internal)
|
| - override;
|
| + void GetWindowManager(
|
| + mojo::AssociatedInterfaceRequest<WindowManager> internal) override;
|
|
|
| - // Overridden from WindowManagerInternal:
|
| + // Overridden from WindowManager:
|
| void WmSetBounds(uint32_t change_id,
|
| Id window_id,
|
| mojo::RectPtr transit_bounds) override;
|
| @@ -265,10 +264,9 @@ class WindowTreeClientImpl : public WindowTreeConnection,
|
|
|
| base::ObserverList<WindowTreeConnectionObserver> observers_;
|
|
|
| - scoped_ptr<mojo::AssociatedBinding<mojom::WindowManagerInternal>>
|
| + scoped_ptr<mojo::AssociatedBinding<mojom::WindowManager>>
|
| window_manager_internal_;
|
| - mojom::WindowManagerInternalClientAssociatedPtr
|
| - window_manager_internal_client_;
|
| + mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_;
|
|
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl);
|
| };
|
|
|