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

ui/gl/gl_surface.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_H_
-#define UI_GFX_GL_GL_SURFACE_H_
+#ifndef UI_GL_GL_SURFACE_H_
+#define UI_GL_GL_SURFACE_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "build/build_config.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"
 
 namespace gfx {
 
 class GLContext;
 
 #if defined(OS_ANDROID)
 class AndroidNativeWindow;
 #endif
 
 // Encapsulates a surface that can be rendered to with GL, hiding platform
@@ skipping 83 matching lines @@
   static GLSurface* GetCurrent();
 
  protected:
   virtual ~GLSurface();
   static bool InitializeOneOffInternal();
   static void SetCurrent(GLSurface* surface);
 
  private:
   friend class base::RefCounted<GLSurface>;
   friend class GLContext;
+
   DISALLOW_COPY_AND_ASSIGN(GLSurface);
 };
 
 // Implementation of GLSurface that forwards all calls through to another
 // GLSurface.
 class GL_EXPORT GLSurfaceAdapter : public GLSurface {
  public:
   explicit GLSurfaceAdapter(GLSurface* surface);
 
   virtual bool Initialize() OVERRIDE;
@@ skipping 13 matching lines @@
   virtual void* GetConfig() OVERRIDE;
   virtual unsigned GetFormat() OVERRIDE;
 
   GLSurface* surface() const { return surface_.get(); }
 
  protected:
   virtual ~GLSurfaceAdapter();
 
  private:
   scoped_refptr<GLSurface> surface_;
+
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceAdapter);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_SURFACE_H_
+#endif  // UI_GL_GL_SURFACE_H_