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

ui/gl/gl_surface_glx.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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 {
 
 // Base class for GLX surfaces.
 class GL_EXPORT GLSurfaceGLX : public GLSurface {
  public:
   GLSurfaceGLX();
   virtual ~GLSurfaceGLX();
 
   static bool InitializeOneOff();
@@ skipping 34 matching lines @@
   virtual bool PostSubBuffer(int x, int y, int width, int height) OVERRIDE;
 
  protected:
   NativeViewGLSurfaceGLX();
 
   gfx::AcceleratedWidget window_;
 
  private:
   void* config_;
   gfx::Size size_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX);
 };
 
 // A surface used to render to an offscreen pbuffer.
 class GL_EXPORT PbufferGLSurfaceGLX : public GLSurfaceGLX {
  public:
   explicit PbufferGLSurfaceGLX(const gfx::Size& size);
   virtual ~PbufferGLSurfaceGLX();
 
   // Implement GLSurfaceGLX.
   virtual bool Initialize() OVERRIDE;
   virtual void Destroy() OVERRIDE;
   virtual bool IsOffscreen() OVERRIDE;
   virtual bool SwapBuffers() OVERRIDE;
   virtual gfx::Size GetSize() OVERRIDE;
   virtual void* GetHandle() OVERRIDE;
   virtual void* GetConfig() OVERRIDE;
 
  private:
   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_