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

BUG=104040
R=ben@chromium.org
TBR=tony@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10392068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136777 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 26 insertions, 26 deletions

diff --git a/media/DEPS b/media/DEPS
index c9b8ea1..16b05be 100644
--- a/media/DEPS
+++ b/media/DEPS
@@ -4,5 +4,5 @@ include_rules = [
   "+third_party/openmax",
   "+third_party/skia",
   "+ui/gfx",
-  "+ui/gfx/gl",
+  "+ui/gl",
 ]
diff --git a/media/media.gyp b/media/media.gyp
index 66b04e3..d42fe5e 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -838,7 +838,7 @@
             'media',
             'yuv_convert',
             '../base/base.gyp:base',
-            '../ui/gfx/gl/gl.gyp:gl',
+            '../ui/gl/gl.gyp:gl',
           ],
           'sources': [
             'tools/shader_bench/shader_bench.cc',
@@ -882,7 +882,7 @@
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
-            '../ui/gfx/gl/gl.gyp:gl',
+            '../ui/gl/gl.gyp:gl',
           ],
           'libraries': [
             '-lGL',
@@ -903,7 +903,7 @@
             'media',
             'yuv_convert',
             '../base/base.gyp:base',
-            '../ui/gfx/gl/gl.gyp:gl',
+            '../ui/gl/gl.gyp:gl',
           ],
           'link_settings': {
             'libraries': [
diff --git a/media/tools/player_x11/gl_video_renderer.cc b/media/tools/player_x11/gl_video_renderer.cc
index ee3c59b..f39a464 100644
--- a/media/tools/player_x11/gl_video_renderer.cc
+++ b/media/tools/player_x11/gl_video_renderer.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -11,7 +11,7 @@
 #include "media/base/buffers.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_implementation.h"
 
 enum { kNumYUVPlanes = 3 };
 
diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h
index 7403e6a..28d3ffb 100644
--- a/media/tools/player_x11/gl_video_renderer.h
+++ b/media/tools/player_x11/gl_video_renderer.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gl/gl_bindings.h"
 
 class MessageLoop;
 
diff --git a/media/tools/shader_bench/gpu_color_painter.cc b/media/tools/shader_bench/gpu_color_painter.cc
index 82d3056..2c81d2b 100644
--- a/media/tools/shader_bench/gpu_color_painter.cc
+++ b/media/tools/shader_bench/gpu_color_painter.cc
@@ -1,9 +1,9 @@
-// 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.
 
 #include "media/tools/shader_bench/gpu_color_painter.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 enum { kNumYUVPlanes = 3 };
 
diff --git a/media/tools/shader_bench/gpu_color_painter.h b/media/tools/shader_bench/gpu_color_painter.h
index 5a000e2..5ca82bc 100644
--- a/media/tools/shader_bench/gpu_color_painter.h
+++ b/media/tools/shader_bench/gpu_color_painter.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "media/base/video_frame.h"
 #include "media/tools/shader_bench/gpu_painter.h"
-#include "ui/gfx/gl/gl_context.h"
+#include "ui/gl/gl_context.h"
 
 // Does color space conversion using luminance textures on GPU,
 // renders using GPU.
diff --git a/media/tools/shader_bench/gpu_painter.h b/media/tools/shader_bench/gpu_painter.h
index 1fcfb8a..edeeda8 100644
--- a/media/tools/shader_bench/gpu_painter.h
+++ b/media/tools/shader_bench/gpu_painter.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,10 +6,10 @@
 #define MEDIA_TOOLS_SHADER_BENCH_GPU_PAINTER_H_
 
 #include "media/tools/shader_bench/painter.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface.h"
 
 // Class that renders video frames to a window via GPU.
 class GPUPainter : public Painter {
diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc
index 83a2bb1..22c7fa5 100644
--- a/media/tools/shader_bench/shader_bench.cc
+++ b/media/tools/shader_bench/shader_bench.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <deque>
-#include <ostream>
 #include <stdio.h>
 #include <stdlib.h>
+#include <deque>
+#include <ostream>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ -18,11 +18,11 @@
 #include "media/tools/shader_bench/gpu_color_painter.h"
 #include "media/tools/shader_bench/painter.h"
 #include "media/tools/shader_bench/window.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
diff --git a/media/tools/tile_render_bench/tile_render_bench.cc b/media/tools/tile_render_bench/tile_render_bench.cc
index 1f19b40..c067ca3 100644
--- a/media/tools/tile_render_bench/tile_render_bench.cc
+++ b/media/tools/tile_render_bench/tile_render_bench.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -8,17 +8,17 @@
 
 #include <iostream>
 
-#include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/keysym.h>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
 
 // Initial size of the window and the texture.
 static const int kStartSize = 1024;