Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: services/ui/ws/test_server_window_delegate.cc

Issue 2527003002: [DONT COMMIT] Revert of Mus: ws/ should not depend on surfaces/ (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/ws/server_window.h" 6 #include "services/ui/ws/server_window.h"
6 #include "services/ui/ws/test_server_window_delegate.h" 7 #include "services/ui/ws/test_server_window_delegate.h"
7 8
8 namespace ui { 9 namespace ui {
9 10
10 namespace ws { 11 namespace ws {
11 12
12 TestServerWindowDelegate::TestServerWindowDelegate() 13 TestServerWindowDelegate::TestServerWindowDelegate()
13 : root_window_(nullptr) {} 14 : root_window_(nullptr),
15 display_compositor_(
16 new DisplayCompositor(nullptr, nullptr, nullptr, nullptr)) {}
14 17
15 TestServerWindowDelegate::~TestServerWindowDelegate() {} 18 TestServerWindowDelegate::~TestServerWindowDelegate() {}
16 19
17 cc::mojom::DisplayCompositor* TestServerWindowDelegate::GetDisplayCompositor() { 20 cc::mojom::DisplayCompositor* TestServerWindowDelegate::GetDisplayCompositor() {
18 return nullptr; 21 return display_compositor_.get();
19 } 22 }
20 23
21 ServerWindow* TestServerWindowDelegate::GetRootWindow( 24 ServerWindow* TestServerWindowDelegate::GetRootWindow(
22 const ServerWindow* window) { 25 const ServerWindow* window) {
23 return root_window_; 26 return root_window_;
24 } 27 }
25 28
26 } // namespace ws 29 } // namespace ws
27 30
28 } // namespace ui 31 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/test_server_window_delegate.h ('k') | services/ui/ws/user_display_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698