Chromium Code Reviews| Index: services/ui/ws/window_server.h |
| diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h |
| index 090948a2a5f43f98198c51e005001dcef3320dc9..2f6165269705f0f4b044e5a7ef21e85b35a8096a 100644 |
| --- a/services/ui/ws/window_server.h |
| +++ b/services/ui/ws/window_server.h |
| @@ -29,6 +29,7 @@ |
| #include "services/ui/ws/window_manager_window_tree_factory_set.h" |
| namespace ui { |
| + |
| namespace ws { |
| class AccessPolicy; |
| @@ -36,6 +37,7 @@ class Display; |
| class DisplayManager; |
| class GpuHost; |
| class ServerWindow; |
| +class ThreadedImageCursorsFactory; |
| class UserActivityMonitor; |
| class WindowManagerState; |
| class WindowServerDelegate; |
| @@ -53,7 +55,7 @@ class WindowServer : public ServerWindowDelegate, |
| public UserIdTrackerObserver, |
| public cc::mojom::FrameSinkManagerClient { |
| public: |
| - explicit WindowServer(WindowServerDelegate* delegate); |
|
sky
2017/07/13 17:14:58
Keep the explicit?
mfomitchev
2017/07/13 17:53:06
Done.
|
| + WindowServer(WindowServerDelegate* delegate); |
| ~WindowServer() override; |
| WindowServerDelegate* delegate() { return delegate_; } |
| @@ -81,6 +83,8 @@ class WindowServer : public ServerWindowDelegate, |
| void SetGpuHost(std::unique_ptr<GpuHost> gpu_host); |
| + ThreadedImageCursorsFactory* GetThreadedImageCursorsFactory(); |
| + |
| // Creates a new ServerWindow. The return value is owned by the caller, but |
| // must be destroyed before WindowServer. |
| ServerWindow* CreateServerWindow( |