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

ui/gl/gl_context.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_CONTEXT_H_
-#define UI_GFX_GL_GL_CONTEXT_H_
+#ifndef UI_GL_GL_CONTEXT_H_
+#define UI_GL_GL_CONTEXT_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "ui/gfx/gl/gl_share_group.h"
-#include "ui/gfx/gl/gpu_preference.h"
+#include "ui/gl/gl_share_group.h"
+#include "ui/gl/gpu_preference.h"
 
 namespace gfx {
 
 class GLSurface;
 
 // Encapsulates an OpenGL context, hiding platform specific management.
 class GL_EXPORT GLContext : public base::RefCounted<GLContext> {
  public:
   explicit GLContext(GLShareGroup* share_group);
 
@@ skipping 51 matching lines @@
  protected:
   virtual ~GLContext();
   static void SetCurrent(GLContext* context, GLSurface* surface);
 
   // Initialize function pointers to extension functions in the GL
   // implementation. Should be called immediately after this context is made
   // current.
   bool InitializeExtensionBindings();
 
  private:
+  friend class base::RefCounted<GLContext>;
+
   scoped_refptr<GLShareGroup> share_group_;
-  friend class base::RefCounted<GLContext>;
+
   DISALLOW_COPY_AND_ASSIGN(GLContext);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_H_
+#endif  // UI_GL_GL_CONTEXT_H_