Refactor: Move app/gfx/gl ==> ui/gfx/gl

This is the final patch in the sequence. Note that gl.gyp is introduced because dependency checking on the Mac is done on a per file (rather than per target) basis.

BUG=none
TEST=trybots

Review URL: http://codereview.chromium.org/6722026

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

10 files changed, 19 insertions, 19 deletions

diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index 1d1d36f..723a55a 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -13,7 +13,6 @@ extern "C" {
 #include <signal.h>
 #include <sys/param.h>
 
-#include "app/gfx/gl/gl_context.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ -29,6 +28,7 @@ extern "C" {
 #include "content/common/chrome_application_mac.h"
 #include "content/common/content_switches.h"
 #include "unicode/uchar.h"
+#include "ui/gfx/gl/gl_context.h"
 
 namespace {
 
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index fec3a08..74ab725 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -13,10 +13,10 @@
       'msvs_guid': 'F10F1ECD-D84D-4C33-8468-9DDFE19F4D8A',
       'dependencies': [
         'content_common',
-        '../app/app.gyp:app_base',
         '../base/base.gyp:base',
         '../media/media.gyp:media',
         '../skia/skia.gyp:skia',
+        '../ui/gfx/gl/gl.gyp:gl',
       ],
       'sources': [
         'gpu/content_gpu_client.h',
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 12a8ec9..9597c0c 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/gl/gl_context.h"
-#include "app/gfx/gl/gl_implementation.h"
 #include "app/win/scoped_com_initializer.h"
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
@@ -20,6 +18,8 @@
 #include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "ipc/ipc_channel_handle.h"
+#include "ui/gfx/gl/gl_context.h"
+#include "ui/gfx/gl/gl_implementation.h"
 
 #if defined(OS_MACOSX)
 #include "content/common/sandbox_init_wrapper.h"
diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc
index 13b293e..6b37c27 100644
--- a/content/gpu/gpu_info_collector.cc
+++ b/content/gpu/gpu_info_collector.cc
@@ -7,12 +7,12 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/gl/gl_bindings.h"
-#include "app/gfx/gl/gl_context.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_split.h"
+#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gfx/gl/gl_context.h"
 
 namespace {
 
diff --git a/content/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc
index a627468..64087d2 100644
--- a/content/gpu/gpu_info_collector_linux.cc
+++ b/content/gpu/gpu_info_collector_linux.cc
@@ -7,9 +7,6 @@
 #include <dlfcn.h>
 #include <vector>
 
-#include "app/gfx/gl/gl_bindings.h"
-#include "app/gfx/gl/gl_context.h"
-#include "app/gfx/gl/gl_implementation.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -17,6 +14,9 @@
 #include "base/string_split.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
+#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gfx/gl/gl_context.h"
+#include "ui/gfx/gl/gl_implementation.h"
 
 namespace {
 
diff --git a/content/gpu/gpu_info_collector_mac.mm b/content/gpu/gpu_info_collector_mac.mm
index d1edf3c..dd9b663 100644
--- a/content/gpu/gpu_info_collector_mac.mm
+++ b/content/gpu/gpu_info_collector_mac.mm
@@ -4,14 +4,14 @@
 
 #include "content/gpu/gpu_info_collector.h"
 
-#include "app/gfx/gl/gl_bindings.h"
-#include "app/gfx/gl/gl_context.h"
-#include "app/gfx/gl/gl_implementation.h"
-#include "app/gfx/gl/gl_interface.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/sys_string_conversions.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_interface.h"
 
 #import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
diff --git a/content/gpu/gpu_info_collector_unittest.cc b/content/gpu/gpu_info_collector_unittest.cc
index 0085c62..d787e89 100644
--- a/content/gpu/gpu_info_collector_unittest.cc
+++ b/content/gpu/gpu_info_collector_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/gl/gl_implementation.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/gpu_info.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "gpu/command_buffer/common/gl_mock.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/gl/gl_implementation.h"
 
 using ::gfx::MockGLInterface;
 using ::testing::Return;
diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc
index 3e86f1c8..69da85f 100644
--- a/content/gpu/gpu_info_collector_win.cc
+++ b/content/gpu/gpu_info_collector_win.cc
@@ -8,13 +8,13 @@
 #include <setupapi.h>
 #include <windows.h>
 
-#include "app/gfx/gl/gl_context_egl.h"
-#include "app/gfx/gl/gl_implementation.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_native_library.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "ui/gfx/gl/gl_context_egl.h"
+#include "ui/gfx/gl/gl_implementation.h"
 
 // ANGLE seems to require that main.h be included before any other ANGLE header.
 #include "libEGL/main.h"
diff --git a/content/gpu/gpu_render_thread.cc b/content/gpu/gpu_render_thread.cc
index 7930337..784d3e5 100644
--- a/content/gpu/gpu_render_thread.cc
+++ b/content/gpu/gpu_render_thread.cc
@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/gl/gl_context.h"
-#include "app/gfx/gl/gl_implementation.h"
 #include "app/win/scoped_com_initializer.h"
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
@@ -21,6 +19,8 @@
 #include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "ipc/ipc_channel_handle.h"
+#include "ui/gfx/gl/gl_context.h"
+#include "ui/gfx/gl/gl_implementation.h"
 
 GpuRenderThread::GpuRenderThread(IPC::Message::Sender* browser_channel,
                                  GpuWatchdogThread* gpu_watchdog_thread,
diff --git a/content/gpu/media/fake_gl_video_device.cc b/content/gpu/media/fake_gl_video_device.cc
index f4e8746e6..18fb09e 100644
--- a/content/gpu/media/fake_gl_video_device.cc
+++ b/content/gpu/media/fake_gl_video_device.cc
@@ -4,8 +4,8 @@
 
 #include "content/gpu/media/fake_gl_video_device.h"
 
-#include "app/gfx/gl/gl_bindings.h"
 #include "media/base/video_frame.h"
+#include "ui/gfx/gl/gl_bindings.h"
 
 void* FakeGlVideoDevice::GetDevice() {
   // No actual hardware device should be used.