| Index: components/mus/ws/window_tree_host_impl.h
|
| diff --git a/components/mus/ws/window_tree_host_impl.h b/components/mus/ws/window_tree_host_impl.h
|
| index ae23e2c117018f74b055add200cc91726c9835e6..916044356442093b18c55e14dc8812a5365c8152 100644
|
| --- a/components/mus/ws/window_tree_host_impl.h
|
| +++ b/components/mus/ws/window_tree_host_impl.h
|
| @@ -93,6 +93,10 @@ class WindowTreeHostImpl : public DisplayManagerDelegate,
|
| const ui::TextInputState& state);
|
| void SetImeVisibility(ServerWindow* window, bool visible);
|
|
|
| + // Called when a client updates a cursor. This will update the cursor on the
|
| + // native display if the cursor is currently under |window|.
|
| + void OnCursorUpdated(ServerWindow* window);
|
| +
|
| // WindowTreeHost:
|
| void SetSize(mojo::SizePtr size) override;
|
| void SetTitle(const mojo::String& title) override;
|
| @@ -117,6 +121,8 @@ class WindowTreeHostImpl : public DisplayManagerDelegate,
|
| void OnEventAckTimeout();
|
| void DispatchNextEventFromQueue();
|
|
|
| + void UpdateNativeCursor(int32_t cursor_id);
|
| +
|
| // DisplayManagerDelegate:
|
| ServerWindow* GetRootWindow() override;
|
| void OnEvent(mojom::EventPtr event) override;
|
| @@ -158,6 +164,9 @@ class WindowTreeHostImpl : public DisplayManagerDelegate,
|
| mojom::WindowManagerPtr window_manager_;
|
| mojom::WindowTree* tree_awaiting_input_ack_;
|
|
|
| + // The last cursor set. Used to track whether we need to change the cursor.
|
| + int32_t last_cursor_;
|
| +
|
| std::set<WindowId> activation_parents_;
|
|
|
| // Set of windows with surfaces that need to be destroyed once the frame
|
|
|