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

Unified Diff: ui/compositor/test/test_suite.cc

Issue 2737513003: Fix compositor_unittests with Ozone X11. (Closed)
Patch Set: Other. Created 3 years, 9 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 | « ui/compositor/test/test_compositor_host_ozone.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/test_suite.cc
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
index 2403d36eb630ea1ebca2acf8334ae5543b6d70ce..fb63c1c73d25a18d9e34feef960841c477fb3b5e 100644
--- a/ui/compositor/test/test_suite.cc
+++ b/ui/compositor/test/test_suite.cc
@@ -13,6 +13,10 @@
#include "ui/gfx/gfx_paths.h"
#include "ui/gl/test/gl_surface_test_support.h"
+#if defined(USE_OZONE)
+#include "ui/ozone/public/ozone_platform.h"
+#endif
+
#if defined(OS_WIN)
#include "ui/display/win/dpi.h"
#endif
@@ -31,6 +35,10 @@ void CompositorTestSuite::Initialize() {
gfx::RegisterPathProvider();
+#if defined(USE_OZONE)
danakj 2017/03/06 20:56:16 nit: group with GLSurface init
kylechar 2017/03/06 21:50:40 Done.
+ ui::OzonePlatform::InitializeForUI();
+#endif
+
#if defined(OS_WIN)
display::win::SetDefaultDeviceScaleFactor(1.0f);
#endif
« no previous file with comments | « ui/compositor/test/test_compositor_host_ozone.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698