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

Unified Diff: services/ui/ws/platform_display.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/frame_generator_unittest.cc ('k') | services/ui/ws/platform_display_init_params.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/platform_display.cc
diff --git a/services/ui/ws/platform_display.cc b/services/ui/ws/platform_display.cc
index 367bdf7e847fd16d0eb72228e3db8e8a391701d1..6589b40364532899af418c01ac1a941d035ecc46 100644
--- a/services/ui/ws/platform_display.cc
+++ b/services/ui/ws/platform_display.cc
@@ -13,8 +13,8 @@
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/connector.h"
#include "services/ui/display/platform_screen.h"
+#include "services/ui/surfaces/compositor_frame_sink.h"
#include "services/ui/surfaces/display_compositor.h"
-#include "services/ui/surfaces/surfaces_state.h"
#include "services/ui/ws/platform_display_factory.h"
#include "services/ui/ws/platform_display_init_params.h"
#include "services/ui/ws/server_window.h"
@@ -59,7 +59,8 @@ DefaultPlatformDisplay::DefaultPlatformDisplay(
#if !defined(OS_ANDROID)
cursor_loader_(ui::CursorLoader::Create()),
#endif
- frame_generator_(new FrameGenerator(this, init_params.surfaces_state)),
+ frame_generator_(
+ new FrameGenerator(this, init_params.display_compositor)),
metrics_(init_params.metrics) {
}
« no previous file with comments | « services/ui/ws/frame_generator_unittest.cc ('k') | services/ui/ws/platform_display_init_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698