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

WATCHLISTS

@@ -286,7 +286,7 @@
       'filepath': 'ui/compositor/.*'
     },
     'browser_gl': {
-      'filepath': 'ui/gfx/gl/.*'
+      'filepath': 'ui/gl/.*'
     },
     'textinput': {
       'filepath': 'content/browser/renderer_host/gtk_im.*'\

chrome/browser/about_flags.cc

@@ -23,7 +23,7 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 
 #if defined(USE_ASH)
 #include "ash/ash_switches.h"

chrome/browser/chromeos/login/login_utils.cc

@@ -85,7 +85,7 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/compositor_switches.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 #include "webkit/plugins/plugin_switches.h"
 
 using content::BrowserThread;

chrome/browser/extensions/extension_webstore_private_apitest.cc

@@ -26,7 +26,7 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "net/base/mock_host_resolver.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 
 using content::GpuFeatureType;
 

chrome/chrome_browser.gypi

@@ -4362,7 +4362,7 @@
         }],
         ['ui_compositor_image_transport==1', {
           'dependencies': [
-            '../ui/gfx/gl/gl.gyp:gl',
+            '../ui/gl/gl.gyp:gl',
           ],
         }],
         ['use_virtual_keyboard==0', {

chrome/chrome_tests.gypi

@@ -996,7 +996,7 @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../tools/json_schema_compiler/test/json_schema_compiler_tests.gyp:json_schema_compiler_tests',
-        '../ui/gfx/gl/gl.gyp:gl',
+        '../ui/gl/gl.gyp:gl',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         '../ui/ui.gyp:ui_test_support',

chrome/common/chrome_switches.h

@@ -17,7 +17,7 @@ namespace switches {
 
 // -----------------------------------------------------------------------------
 // Can't find the switch you are looking for? Try looking in
-// ui/gfx/gl/gl_switches.cc or base/base_switches.cc or
+// ui/gl/gl_switches.cc or base/base_switches.cc or
 // content/public/common/content_switches.cc or media/base/media_switches.cc
 // instead.
 // -----------------------------------------------------------------------------

chrome/test/base/test_launcher_utils.cc

@@ -12,7 +12,7 @@
 #include "base/string_number_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 
 #if defined(USE_ASH)
 #include "ash/ash_switches.h"

chrome/test/gpu/gpu_crash_browsertest.cc

@@ -13,7 +13,7 @@
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_implementation.h"
 
 namespace {
 

chrome/test/gpu/gpu_feature_browsertest.cc

@@ -21,7 +21,7 @@
 #include "content/test/gpu/gpu_test_config.h"
 #include "content/test/gpu/test_switches.h"
 #include "net/base/net_util.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 #if defined(OS_MACOSX)
 #include "ui/surface/io_surface_support_mac.h"
 #endif

chrome/test/gpu/gpu_pixel_browsertest.cc

@@ -28,8 +28,8 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/compositor/compositor_setup.h"
 #include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/gl/gl_switches.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_switches.h"
 
 namespace {
 

chrome/test/perf/frame_rate/frame_rate_tests.cc

@@ -19,8 +19,8 @@
 #include "chrome/test/ui/javascript_test_util.h"
 #include "chrome/test/ui/ui_perf_test.h"
 #include "net/base/net_util.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_switches.h"
 
 namespace {
 

chrome/test/perf/rendering/throughput_tests.cc

@@ -8,8 +8,8 @@
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/values.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ -33,7 +33,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 
 namespace {
 

chrome/test/ui/ui_test.cc

@@ -50,7 +50,7 @@
 #include "content/common/debug_flags.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
-#include "ui/gfx/gl/gl_implementation.h"
+#include "ui/gl/gl_implementation.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"

content/DEPS

@@ -54,6 +54,7 @@ include_rules = [
   "+ui/base",
   "+ui/compositor",
   "+ui/gfx",
+  "+ui/gl",
   "+ui/surface",
   # Content knows about grd files, but the specifics of how to get a resource
   # given its id is left to the embedder.

content/browser/gpu/gpu_data_manager_impl.cc

@@ -19,8 +19,8 @@
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_switches.h"
 #include "webkit/plugins/plugin_switches.h"
 
 using content::BrowserThread;

content/browser/gpu/gpu_process_host.cc

@@ -33,9 +33,9 @@
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_switches.h"
 
 #if defined(TOOLKIT_GTK)
 #include "ui/gfx/gtk_native_view_id_manager.h"

content/browser/gpu/gpu_process_host_ui_shim.cc

@@ -21,7 +21,7 @@
 #include "content/common/gpu/gpu_messages.h"
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/browser_thread.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 
 #if defined(TOOLKIT_GTK)
 // These two #includes need to come after gpu_messages.h.

content/browser/plugin_process_host.cc

@@ -35,8 +35,8 @@
 #include "content/public/common/process_type.h"
 #include "ipc/ipc_switches.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/gfx/gl/gl_switches.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gl/gl_switches.h"
 
 using content::BrowserThread;
 using content::ChildProcessData;

content/browser/renderer_host/accelerated_plugin_view_mac.mm

@@ -11,9 +11,9 @@
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #include "content/public/browser/browser_thread.h"
 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_switches.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_switches.h"
 
 using content::BrowserThread;
 

content/browser/renderer_host/compositing_iosurface_mac.mm

@@ -12,9 +12,9 @@
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_switches.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_switches.h"
 #include "ui/surface/io_surface_support_mac.h"
 
 #ifdef NDEBUG

content/browser/renderer_host/image_transport_client_linux.cc

@@ -14,12 +14,12 @@
 #include "content/browser/renderer_host/image_transport_factory.h"
 #include "third_party/angle/include/EGL/egl.h"
 #include "third_party/angle/include/EGL/eglext.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
-#include "ui/gfx/gl/gl_surface_glx.h"
-#include "ui/gfx/gl/scoped_make_current.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_implementation.h"
+#include "ui/gl/gl_surface_egl.h"
+#include "ui/gl/gl_surface_glx.h"
+#include "ui/gl/scoped_make_current.h"
 
 namespace {
 

content/browser/renderer_host/image_transport_factory.cc

@@ -23,9 +23,9 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_setup.h"
-#include "ui/gfx/gl/scoped_make_current.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/scoped_make_current.h"
 
 using content::BrowserGpuChannelHostFactory;
 using content::GLHelper;

content/browser/renderer_host/render_process_host_impl.cc

@@ -105,7 +105,7 @@
 #include "media/base/media_switches.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/plugins/plugin_switches.h"

content/common/gpu/client/gl_helper.cc

@@ -17,8 +17,8 @@
 #include "base/threading/thread_restrictions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
-#include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_bindings.h"
 
 using WebKit::WebGLId;
 using WebKit::WebGraphicsContext3D;

content/common/gpu/client/gpu_channel_host.h

@@ -17,16 +17,16 @@
 #include "base/process_util.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
+#include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/common/message_router.h"
 #include "content/public/common/gpu_info.h"
-#include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_sync_channel.h"
-#include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gpu_preference.h"
 
 class CommandBufferProxy;
 class CommandBufferProxyImpl;

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h

@@ -17,7 +17,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
-#include "ui/gfx/gl/gpu_preference.h"
+#include "ui/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(USE_SKIA)

content/common/gpu/gpu_channel.cc

@@ -19,8 +19,8 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
-#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"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"

content/common/gpu/gpu_channel.h

@@ -19,10 +19,10 @@
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/message_router.h"
 #include "ipc/ipc_sync_channel.h"
-#include "ui/gfx/gl/gl_share_group.h"
-#include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_share_group.h"
+#include "ui/gl/gpu_preference.h"
 
 class GpuChannelManager;
 struct GPUCreateCommandBufferConfig;

content/common/gpu/gpu_channel_manager.cc

@@ -7,9 +7,9 @@
 #include "base/bind.h"
 #include "content/common/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
-#include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_memory_manager.h"
-#include "ui/gfx/gl/gl_share_group.h"
+#include "content/common/gpu/gpu_messages.h"
+#include "ui/gl/gl_share_group.h"
 
 GpuChannelManager::GpuChannelManager(ChildThread* gpu_child_thread,
                                      GpuWatchdog* watchdog,

content/common/gpu/gpu_command_buffer_stub.cc

@@ -20,8 +20,8 @@
 #include "content/common/gpu/image_transport_surface.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "content/public/common/sandbox_init.h"

content/common/gpu/gpu_command_buffer_stub.h

@@ -24,11 +24,11 @@
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_surface.h"
-#include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_surface.h"
+#include "ui/gl/gpu_preference.h"
 #include "ui/surface/transport_dib.h"
 
 #if defined(OS_MACOSX)

content/common/gpu/gpu_messages.h

@@ -20,9 +20,9 @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/video/video_decode_accelerator.h"
-#include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gpu_preference.h"
 #include "ui/surface/transport_dib.h"
 
 #define IPC_MESSAGE_START GpuMsgStart

content/common/gpu/image_transport_surface.cc

@@ -15,7 +15,7 @@
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
-#include "ui/gfx/gl/gl_switches.h"
+#include "ui/gl/gl_switches.h"
 
 ImageTransportSurface::ImageTransportSurface() {}
 

content/common/gpu/image_transport_surface.h

@@ -17,10 +17,10 @@
 #include "base/memory/weak_ptr.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
-#include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
+#include "ui/gl/gl_surface.h"
 #include "ui/surface/transport_dib.h"
 
 class GpuChannelManager;