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

ui/gl/scoped_make_current.h

Index: ui/gl/scoped_make_current.h
diff --git a/ui/gfx/gl/scoped_make_current.h b/ui/gl/scoped_make_current.h
similarity index 68%
rename from ui/gfx/gl/scoped_make_current.h
rename to ui/gl/scoped_make_current.h
index d0d74f71efa79438b2b62b7e53604b4ff5848a2d..3c336f38940523faeb2d6403a0bd82a8824806f0 100644
--- a/ui/gfx/gl/scoped_make_current.h
+++ b/ui/gl/scoped_make_current.h
@@ -1,13 +1,13 @@
-// 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_SCOPED_MAKE_CURRENT_H_
-#define UI_GFX_GL_SCOPED_MAKE_CURRENT_H_
+#ifndef UI_GL_SCOPED_MAKE_CURRENT_H_
+#define UI_GL_SCOPED_MAKE_CURRENT_H_
 #pragma once
 
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_surface.h"
 
 namespace gfx {
 
@@ -24,10 +24,10 @@ class GL_EXPORT ScopedMakeCurrent {
   scoped_refptr<GLContext> context_;
   scoped_refptr<GLSurface> surface_;
   bool succeeded_;
+
   DISALLOW_COPY_AND_ASSIGN(ScopedMakeCurrent);
 };
 
 }  // namespace gfx
 
-#endif  // UI_GFX_GL_SCOPED_MAKE_CURRENT_H_
-
+#endif  // UI_GL_SCOPED_MAKE_CURRENT_H_