Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/common/gpu/media/gpu_video_decode_accelerator.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/media/dxva_video_decode_accelerator.cc ('k') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc
index 0ef9d87a67eb3822d57712703c96e60fac187b2c..6ad1329446cbfa7450a667076c062f38998920c1 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -14,12 +14,12 @@
#include "base/win/windows_version.h"
#endif // OS_WIN
-#include "gpu/command_buffer/common/command_buffer.h"
-#include "ipc/ipc_message_macros.h"
-#include "ipc/ipc_message_utils.h"
#include "content/common/gpu/gpu_channel.h"
#include "content/common/gpu/gpu_command_buffer_stub.h"
#include "content/common/gpu/gpu_messages.h"
+#include "gpu/command_buffer/common/command_buffer.h"
+#include "ipc/ipc_message_macros.h"
+#include "ipc/ipc_message_utils.h"
#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)) || defined(OS_WIN)
#if defined(OS_WIN)
@@ -27,8 +27,8 @@
#else // OS_WIN
#include "content/common/gpu/media/omx_video_decode_accelerator.h"
#endif // OS_WIN
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
+#include "ui/gl/gl_context.h"
+#include "ui/gl/gl_surface_egl.h"
#endif
#include "gpu/command_buffer/service/texture_manager.h"
« no previous file with comments | « content/common/gpu/media/dxva_video_decode_accelerator.cc ('k') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698