summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 01:01:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 01:01:06 +0000
commit34b9963c187a733bef76535521f3de688fffd34f (patch)
treea0569030e3a2ecc5b9c88d31a2469a380de85346 /media/tools
parent1a2a571b157327f75acd56bd594ef0863481dc32 (diff)
downloadchromium_src-34b9963c187a733bef76535521f3de688fffd34f.zip
chromium_src-34b9963c187a733bef76535521f3de688fffd34f.tar.gz
chromium_src-34b9963c187a733bef76535521f3de688fffd34f.tar.bz2
Move base/thread.h to base/threading, fix up callers to use the new location.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/6028009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/player_wtl/movie.h2
-rw-r--r--media/tools/player_x11/player_x11.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h
index 581a0db..ea81b09 100644
--- a/media/tools/player_wtl/movie.h
+++ b/media/tools/player_wtl/movie.h
@@ -11,7 +11,7 @@
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
template <typename T> struct DefaultSingletonTraits;
class WtlVideoRenderer;
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 4a66bfa..2d49d7c 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -11,7 +11,7 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/scoped_ptr.h"
-#include "base/thread.h"
+#include "base/threading/thread.h"
#include "media/base/callback.h"
#include "media/base/filter_collection.h"
#include "media/base/media.h"