ui: Move gl/ directory out of gfx/, up to ui/.

ui/gl/gl_surface_glx.h

Index: ui/gl/gl_surface_glx.h
diff --git a/ui/gfx/gl/gl_surface_glx.h b/ui/gl/gl_surface_glx.h
similarity index 93%
rename from ui/gfx/gl/gl_surface_glx.h
rename to ui/gl/gl_surface_glx.h
index bad9cd7c1ba50c412db1feacd6313e2db83c7e3d..ac4655e990232baed679fc1534d0ba0aca3f7e19 100644
--- a/ui/gfx/gl/gl_surface_glx.h
+++ b/ui/gl/gl_surface_glx.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_GL_GL_SURFACE_GLX_H_
-#define UI_GFX_GL_GL_SURFACE_GLX_H_
-
-#include "ui/gfx/gl/gl_surface.h"
+#ifndef UI_GL_GL_SURFACE_GLX_H_
+#define UI_GL_GL_SURFACE_GLX_H_
+#pragma once
 
 #include "base/compiler_specific.h"
 #include "ui/base/x/x11_util.h"
-#include "ui/gfx/gl/gl_export.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_export.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -66,6 +66,7 @@ class GL_EXPORT NativeViewGLSurfaceGLX : public GLSurfaceGLX {
  private:
   void* config_;
   gfx::Size size_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX);
 };
 
@@ -88,9 +89,10 @@ class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX {
   gfx::Size size_;
   void* config_;
   XID pbuffer_;
+
   DISALLOW_COPY_AND_ASSIGN(PbufferGLSurfaceGLX);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_GLX_H_
+#endif  // UI_GL_GL_SURFACE_GLX_H_