1 files changed, 3 insertions, 14 deletions
diff --git a/ui/gfx/gl/gl_surface_egl.cc b/ui/gfx/gl/gl_surface_egl.cc
index 7f4fb36..df529a2 100644
--- a/ui/gfx/gl/gl_surface_egl.cc
+++ b/ui/gfx/gl/gl_surface_egl.cc
@@ -23,16 +23,12 @@
 // it brings in #defines that cause conflicts.
 #include "ui/gfx/gl/gl_bindings.h"
 
-#if defined(USE_X11) && !defined(USE_WAYLAND)
+#if defined(USE_X11)
 extern "C" {
 #include <X11/Xlib.h>
 }
 #endif
 
-#if defined(USE_WAYLAND)
-#include "ui/wayland/wayland_display.h"
-#endif
-
 namespace gfx {
 
 namespace {
@@ -55,9 +51,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
   if (initialized)
     return true;
 
-#if defined(USE_WAYLAND)
-  g_native_display = ui::WaylandDisplay::Connect(NULL)->display();
-#elif defined(USE_X11)
+#if defined(USE_X11)
   g_native_display = base::MessagePumpForUI::GetDefaultXDisplay();
 #else
   g_native_display = EGL_DEFAULT_DISPLAY;
@@ -81,12 +75,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
     EGL_GREEN_SIZE, 8,
     EGL_RED_SIZE, 8,
     EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL_SURFACE_TYPE, EGL_WINDOW_BIT
-#if defined(USE_WAYLAND)
-    | EGL_PIXMAP_BIT,
-#else
-    | EGL_PBUFFER_BIT,
-#endif
+    EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
     EGL_NONE
   };