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

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

Issue 2386763002: services/ui: Match naming in cc (and jellyfish branch) (Closed)
Patch Set: Removed bad change Created 4 years, 2 months 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_utils.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_utils.cc
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index cc254c153f3907c20f9445392b4add1592871ea0..e842ca8c5c84bd57c529b3f0fb81bbdca28d5053 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -11,7 +11,7 @@
#include "gpu/ipc/client/gpu_channel_host.h"
#include "services/shell/public/interfaces/connector.mojom.h"
#include "services/ui/public/interfaces/cursor.mojom.h"
-#include "services/ui/surfaces/surfaces_state.h"
+#include "services/ui/surfaces/display_compositor.h"
#include "services/ui/ws/display_binding.h"
#include "services/ui/ws/display_manager.h"
#include "services/ui/ws/platform_display_init_params.h"
@@ -485,9 +485,9 @@ WindowEventTargetingHelper::WindowEventTargetingHelper()
: wm_client_(nullptr),
display_binding_(nullptr),
display_(nullptr),
- surfaces_state_(new SurfacesState()) {
+ display_compositor_(new DisplayCompositor()) {
PlatformDisplayInitParams display_init_params;
- display_init_params.surfaces_state = surfaces_state_;
+ display_init_params.display_compositor = display_compositor_;
display_ = new Display(window_server(), display_init_params);
display_binding_ = new TestDisplayBinding(window_server());
display_->Init(base::WrapUnique(display_binding_));
« no previous file with comments | « services/ui/ws/test_utils.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