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 "components/mus/surfaces/surfaces_state.h" | |
5 #include "components/mus/ws/test_server_window_delegate.h" | 6 #include "components/mus/ws/test_server_window_delegate.h" |
6 #include "components/mus/ws/server_window.h" | 7 #include "components/mus/ws/server_window.h" |
7 | 8 |
8 namespace mus { | 9 namespace mus { |
9 | 10 |
10 namespace ws { | 11 namespace ws { |
11 | 12 |
12 TestServerWindowDelegate::TestServerWindowDelegate() : root_window_(nullptr) {} | 13 TestServerWindowDelegate::TestServerWindowDelegate() |
14 : root_window_(nullptr), surfaces_state_(new SurfacesState()) {} | |
enne (OOO)
2016/03/02 22:04:40
Added in a real surfaces state so there was a real
sky
2016/03/02 23:45:34
SG
| |
13 | 15 |
14 TestServerWindowDelegate::~TestServerWindowDelegate() {} | 16 TestServerWindowDelegate::~TestServerWindowDelegate() {} |
15 | 17 |
16 mus::SurfacesState* TestServerWindowDelegate::GetSurfacesState() { | 18 mus::SurfacesState* TestServerWindowDelegate::GetSurfacesState() { |
17 return nullptr; | 19 return surfaces_state_.get(); |
18 } | 20 } |
19 | 21 |
20 void TestServerWindowDelegate::OnScheduleWindowPaint( | 22 void TestServerWindowDelegate::OnScheduleWindowPaint( |
21 const ServerWindow* window) {} | 23 const ServerWindow* window) {} |
22 | 24 |
23 const ServerWindow* TestServerWindowDelegate::GetRootWindow( | 25 const ServerWindow* TestServerWindowDelegate::GetRootWindow( |
24 const ServerWindow* window) const { | 26 const ServerWindow* window) const { |
25 return root_window_; | 27 return root_window_; |
26 } | 28 } |
27 | 29 |
28 void TestServerWindowDelegate::ScheduleSurfaceDestruction( | 30 void TestServerWindowDelegate::ScheduleSurfaceDestruction( |
29 ServerWindow* window) {} | 31 ServerWindow* window) {} |
30 | 32 |
31 ServerWindow* TestServerWindowDelegate::FindWindowForSurface( | 33 ServerWindow* TestServerWindowDelegate::FindWindowForSurface( |
32 const ServerWindow* ancestor, | 34 const ServerWindow* ancestor, |
33 mojom::SurfaceType surface_type, | 35 mojom::SurfaceType surface_type, |
34 const ClientWindowId& client_window_id) { | 36 const ClientWindowId& client_window_id) { |
35 return nullptr; | 37 return nullptr; |
36 } | 38 } |
37 | 39 |
38 } // namespace ws | 40 } // namespace ws |
39 | 41 |
40 } // namespace mus | 42 } // namespace mus |
OLD | NEW |