summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-05 01:53:38 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-05 01:53:38 +0000
commit08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8 (patch)
treef961683ebee575109805b3d465032057f4b01fe5 /media
parentb87b12e002f8c21806b4848be90c5e563bf5337d (diff)
downloadchromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.zip
chromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.tar.gz
chromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.tar.bz2
Change includes of gfx/* to ui/gfx/*
BUG=71063 TEST=compiled Review URL: http://codereview.chromium.org/6312156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/DEPS2
-rw-r--r--media/tools/mfdecoder/main.cc2
-rw-r--r--media/tools/shader_bench/shader_bench.cc2
-rw-r--r--media/tools/shader_bench/window.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/media/DEPS b/media/DEPS
index 03c7a745..a1dfd37 100644
--- a/media/DEPS
+++ b/media/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+app/gfx/gl",
- "+gfx",
"+third_party/ffmpeg",
"+third_party/openmax",
+ "+ui/gfx",
]
diff --git a/media/tools/mfdecoder/main.cc b/media/tools/mfdecoder/main.cc
index ed9220b..788bda0 100644
--- a/media/tools/mfdecoder/main.cc
+++ b/media/tools/mfdecoder/main.cc
@@ -22,9 +22,9 @@
#include "base/scoped_comptr_win.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
-#include "gfx/gdi_util.h"
#include "media/base/yuv_convert.h"
#include "media/tools/mfdecoder/mfdecoder.h"
+#include "ui/gfx/gdi_util.h"
namespace {
diff --git a/media/tools/shader_bench/shader_bench.cc b/media/tools/shader_bench/shader_bench.cc
index 6bdfe67..62afb47 100644
--- a/media/tools/shader_bench/shader_bench.cc
+++ b/media/tools/shader_bench/shader_bench.cc
@@ -15,7 +15,6 @@
#include "base/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "base/time.h"
-#include "gfx/native_widget_types.h"
#include "media/base/callback.h"
#include "media/base/video_frame.h"
#include "media/tools/shader_bench/cpu_color_painter.h"
@@ -23,6 +22,7 @@
#include "media/tools/shader_bench/gpu_color_painter_exp.h"
#include "media/tools/shader_bench/painter.h"
#include "media/tools/shader_bench/window.h"
+#include "ui/gfx/native_widget_types.h"
#if defined(OS_LINUX)
#include <gtk/gtk.h>
diff --git a/media/tools/shader_bench/window.h b/media/tools/shader_bench/window.h
index b17786a..3de1214 100644
--- a/media/tools/shader_bench/window.h
+++ b/media/tools/shader_bench/window.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_TOOLS_SHADER_BENCH_WINDOW_H_
#define MEDIA_TOOLS_SHADER_BENCH_WINDOW_H_
-#include "gfx/native_widget_types.h"
+#include "ui/gfx/native_widget_types.h"
class Painter;
class Task;