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

Unified Diff: services/ui/ws/window_tree_host_factory.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/window_server.cc ('k') | services/ui/ws/window_tree_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_tree_host_factory.cc
diff --git a/services/ui/ws/window_tree_host_factory.cc b/services/ui/ws/window_tree_host_factory.cc
index b1b96168279f48549dfa344df3d52c8e4362636d..37681caa6346032ab868f87402c261647624efde 100644
--- a/services/ui/ws/window_tree_host_factory.cc
+++ b/services/ui/ws/window_tree_host_factory.cc
@@ -4,7 +4,7 @@
#include "services/ui/ws/window_tree_host_factory.h"
-#include "services/ui/surfaces/surfaces_state.h"
+#include "services/ui/surfaces/display_compositor.h"
#include "services/ui/ws/display.h"
#include "services/ui/ws/display_binding.h"
#include "services/ui/ws/window_server.h"
@@ -19,8 +19,8 @@ WindowTreeHostFactory::WindowTreeHostFactory(WindowServer* window_server,
platform_display_init_params_.metrics.bounds.set_height(768);
platform_display_init_params_.metrics.pixel_size.SetSize(1024, 768);
platform_display_init_params_.metrics.device_scale_factor = 1.0f;
- platform_display_init_params_.surfaces_state =
- window_server_->GetSurfacesState();
+ platform_display_init_params_.display_compositor =
+ window_server_->GetDisplayCompositor();
}
WindowTreeHostFactory::~WindowTreeHostFactory() {}
« no previous file with comments | « services/ui/ws/window_server.cc ('k') | services/ui/ws/window_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698