| 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 #include "services/ui/surfaces/display_compositor.h" | 5 #include "services/ui/surfaces/display_compositor.h" |
| 6 #include "services/ui/ws/server_window.h" | 6 #include "services/ui/ws/server_window.h" |
| 7 #include "services/ui/ws/test_server_window_delegate.h" | 7 #include "services/ui/ws/test_server_window_delegate.h" |
| 8 | 8 |
| 9 namespace ui { | 9 namespace ui { |
| 10 | 10 |
| 11 namespace ws { | 11 namespace ws { |
| 12 | 12 |
| 13 TestServerWindowDelegate::TestServerWindowDelegate() | 13 TestServerWindowDelegate::TestServerWindowDelegate() |
| 14 : root_window_(nullptr), | 14 : root_window_(nullptr), |
| 15 display_compositor_(new DisplayCompositor(nullptr)) {} | 15 display_compositor_( |
| 16 new DisplayCompositor(nullptr, nullptr, nullptr, nullptr)) {} |
| 16 | 17 |
| 17 TestServerWindowDelegate::~TestServerWindowDelegate() {} | 18 TestServerWindowDelegate::~TestServerWindowDelegate() {} |
| 18 | 19 |
| 19 ui::DisplayCompositor* TestServerWindowDelegate::GetDisplayCompositor() { | 20 cc::mojom::DisplayCompositor* TestServerWindowDelegate::GetDisplayCompositor() { |
| 20 return display_compositor_.get(); | 21 return display_compositor_.get(); |
| 21 } | 22 } |
| 22 | 23 |
| 23 ServerWindow* TestServerWindowDelegate::GetRootWindow( | 24 ServerWindow* TestServerWindowDelegate::GetRootWindow( |
| 24 const ServerWindow* window) { | 25 const ServerWindow* window) { |
| 25 return root_window_; | 26 return root_window_; |
| 26 } | 27 } |
| 27 | 28 |
| 28 } // namespace ws | 29 } // namespace ws |
| 29 | 30 |
| 30 } // namespace ui | 31 } // namespace ui |
| OLD | NEW |