| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef SERVICES_UI_WS_TEST_SERVER_WINDOW_DELEGATE_H_ | 5 #ifndef SERVICES_UI_WS_TEST_SERVER_WINDOW_DELEGATE_H_ |
| 6 #define SERVICES_UI_WS_TEST_SERVER_WINDOW_DELEGATE_H_ | 6 #define SERVICES_UI_WS_TEST_SERVER_WINDOW_DELEGATE_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "services/ui/surfaces/display_compositor.h" |
| 9 #include "services/ui/ws/server_window_delegate.h" | 10 #include "services/ui/ws/server_window_delegate.h" |
| 10 | 11 |
| 11 namespace ui { | 12 namespace ui { |
| 12 | 13 |
| 13 namespace ws { | 14 namespace ws { |
| 14 | 15 |
| 15 struct WindowId; | 16 struct WindowId; |
| 16 | 17 |
| 17 class TestServerWindowDelegate : public ServerWindowDelegate { | 18 class TestServerWindowDelegate : public ServerWindowDelegate { |
| 18 public: | 19 public: |
| 19 TestServerWindowDelegate(); | 20 TestServerWindowDelegate(); |
| 20 ~TestServerWindowDelegate() override; | 21 ~TestServerWindowDelegate() override; |
| 21 | 22 |
| 22 void set_root_window(ServerWindow* window) { root_window_ = window; } | 23 void set_root_window(ServerWindow* window) { root_window_ = window; } |
| 23 | 24 |
| 24 private: | 25 private: |
| 25 // ServerWindowDelegate: | 26 // ServerWindowDelegate: |
| 26 ui::DisplayCompositor* GetDisplayCompositor() override; | 27 cc::mojom::DisplayCompositor* GetDisplayCompositor() override; |
| 27 ServerWindow* GetRootWindow(const ServerWindow* window) override; | 28 ServerWindow* GetRootWindow(const ServerWindow* window) override; |
| 28 | 29 |
| 29 ServerWindow* root_window_; | 30 ServerWindow* root_window_; |
| 30 scoped_refptr<ui::DisplayCompositor> display_compositor_; | 31 std::unique_ptr<ui::DisplayCompositor> display_compositor_; |
| 31 | 32 |
| 32 DISALLOW_COPY_AND_ASSIGN(TestServerWindowDelegate); | 33 DISALLOW_COPY_AND_ASSIGN(TestServerWindowDelegate); |
| 33 }; | 34 }; |
| 34 | 35 |
| 35 } // namespace ws | 36 } // namespace ws |
| 36 | 37 |
| 37 } // namespace ui | 38 } // namespace ui |
| 38 | 39 |
| 39 #endif // SERVICES_UI_WS_TEST_SERVER_WINDOW_DELEGATE_H_ | 40 #endif // SERVICES_UI_WS_TEST_SERVER_WINDOW_DELEGATE_H_ |
| OLD | NEW |