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