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

ui/gl/gl_context.h

Index: ui/gl/gl_context.h
diff --git a/ui/gfx/gl/gl_context.h b/ui/gl/gl_context.h
similarity index 92%
rename from ui/gfx/gl/gl_context.h
rename to ui/gl/gl_context.h
index 67fe57e4ebcb6fff4c79a6673bbb4c2d054941e8..dc76c00f593fb7f5cc73a8c1abc2d8248833326f 100644
--- a/ui/gfx/gl/gl_context.h
+++ b/ui/gl/gl_context.h
@@ -1,17 +1,17 @@
-// 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 {
 
@@ -83,11 +83,13 @@ class GL_EXPORT GLContext : public base::RefCounted<GLContext> {
   bool InitializeExtensionBindings();
 
  private:
-  scoped_refptr<GLShareGroup> share_group_;
   friend class base::RefCounted<GLContext>;
+
+  scoped_refptr<GLShareGroup> share_group_;
+
   DISALLOW_COPY_AND_ASSIGN(GLContext);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_GL_CONTEXT_H_
+#endif  // UI_GL_GL_CONTEXT_H_