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

Unified Diff: ui/gl/gl_surface_egl.cc

Issue 1167533007: Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/gl/gl_implementation_ozone.cc ('k') | ui/gl/gl_surface_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 2e193a5d5dc2e2fcff8043065594bee13300930c..4d64da7880a2a7d31fddadc8fd1c457dabbe06bc 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -30,7 +30,6 @@
#endif
#if defined (USE_OZONE)
-#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/surface_factory_ozone.h"
#endif
@@ -306,9 +305,9 @@
};
#if defined(USE_OZONE)
- const EGLint* config_attribs = ui::OzonePlatform::GetInstance()
- ->GetSurfaceFactoryOzone()
- ->GetEGLSurfaceProperties(kConfigAttribs);
+ const EGLint* config_attribs =
+ ui::SurfaceFactoryOzone::GetInstance()->GetEGLSurfaceProperties(
+ kConfigAttribs);
#else
const EGLint* config_attribs = kConfigAttribs;
#endif
« no previous file with comments | « ui/gl/gl_implementation_ozone.cc ('k') | ui/gl/gl_surface_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698