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

Unified Diff: ui/gfx/gl/egl_util.cc

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Accidentally pulled in some extra changes in common.gypi Created 9 years, 5 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
Index: ui/gfx/gl/egl_util.cc
diff --git a/ui/gfx/gl/egl_util.cc b/ui/gfx/gl/egl_util.cc
index 29eb92d14e3488ebc3121b47eb9803ba9813ef99..79e2b818393158a58b6014eef4ac3e79f3fd318c 100644
--- a/ui/gfx/gl/egl_util.cc
+++ b/ui/gfx/gl/egl_util.cc
@@ -4,7 +4,11 @@
#include "ui/gfx/gl/egl_util.h"
+#if defined(USE_WAYLAND)
sky 2011/07/27 15:51:05 Condition includes should be after other includes.
sky 2011/07/27 22:22:22 In that case you should have the condition system
+#include <EGL/egl.h>
+#else
#include "third_party/angle/include/EGL/egl.h"
+#endif
#include "ui/gfx/gl/gl_bindings.h"
namespace gfx {
« no previous file with comments | « ui/gfx/canvas_skia_linux.cc ('k') | ui/gfx/gl/gl.gyp » ('j') | ui/gfx/gl/gl.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698