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

Unified Diff: services/ui/ws/test_server_window_delegate.cc

Issue 2521123004: Mus: ws/ should not depend on surfaces/ (Closed)
Patch Set: Rebased Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/test_server_window_delegate.cc
diff --git a/services/ui/ws/test_server_window_delegate.cc b/services/ui/ws/test_server_window_delegate.cc
index 818879fd921af72366f0d27fbed1fc0b12639dc4..a19ee6f6875aec285dee38336e031c177d9b1777 100644
--- a/services/ui/ws/test_server_window_delegate.cc
+++ b/services/ui/ws/test_server_window_delegate.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/ui/surfaces/display_compositor.h"
#include "services/ui/ws/server_window.h"
#include "services/ui/ws/test_server_window_delegate.h"
@@ -11,14 +10,12 @@ namespace ui {
namespace ws {
TestServerWindowDelegate::TestServerWindowDelegate()
- : root_window_(nullptr),
- display_compositor_(
- new DisplayCompositor(nullptr, nullptr, nullptr, nullptr)) {}
+ : root_window_(nullptr) {}
TestServerWindowDelegate::~TestServerWindowDelegate() {}
cc::mojom::DisplayCompositor* TestServerWindowDelegate::GetDisplayCompositor() {
- return display_compositor_.get();
+ return nullptr;
}
ServerWindow* TestServerWindowDelegate::GetRootWindow(
« 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