diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 01:01:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 01:01:06 +0000 |
| commit | 34b9963c187a733bef76535521f3de688fffd34f (patch) | |
| tree | a0569030e3a2ecc5b9c88d31a2469a380de85346 /media | |
| parent | 1a2a571b157327f75acd56bd594ef0863481dc32 (diff) | |
| download | chromium_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')
| -rw-r--r-- | media/audio/audio_input_controller.cc | 2 | ||||
| -rw-r--r-- | media/audio/audio_input_controller.h | 2 | ||||
| -rw-r--r-- | media/audio/audio_manager_base.h | 2 | ||||
| -rw-r--r-- | media/audio/fake_audio_input_stream.h | 2 | ||||
| -rw-r--r-- | media/audio/linux/audio_manager_linux.h | 2 | ||||
| -rw-r--r-- | media/base/pipeline_impl.h | 2 | ||||
| -rw-r--r-- | media/filters/decoder_base.h | 2 | ||||
| -rw-r--r-- | media/filters/ffmpeg_demuxer_unittest.cc | 2 | ||||
| -rw-r--r-- | media/tools/player_wtl/movie.h | 2 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc index 50fb39d..4f08c46 100644 --- a/media/audio/audio_input_controller.cc +++ b/media/audio/audio_input_controller.cc @@ -4,7 +4,7 @@ #include "media/audio/audio_input_controller.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "media/base/limits.h" namespace { diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h index cfba450b3..8afb3bd 100644 --- a/media/audio/audio_input_controller.h +++ b/media/audio/audio_input_controller.h @@ -8,7 +8,7 @@ #include "base/lock.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/audio/audio_io.h" #include "media/audio/audio_manager.h" diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index 370a20c..51364b7 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -7,7 +7,7 @@ #include <map> -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/audio/audio_manager.h" class AudioOutputDispatcher; diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h index 62ab504..b2bba35 100644 --- a/media/audio/fake_audio_input_stream.h +++ b/media/audio/fake_audio_input_stream.h @@ -11,7 +11,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h index a5ba17cf..4ae3b64 100644 --- a/media/audio/linux/audio_manager_linux.h +++ b/media/audio/linux/audio_manager_linux.h @@ -10,7 +10,7 @@ #include "base/lock.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/audio/audio_manager_base.h" class AlsaPcmOutputStream; diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h index aa99f73..ee1f882 100644 --- a/media/base/pipeline_impl.h +++ b/media/base/pipeline_impl.h @@ -15,7 +15,7 @@ #include "base/message_loop.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "base/time.h" #include "media/base/clock.h" #include "media/base/filter_host.h" diff --git a/media/filters/decoder_base.h b/media/filters/decoder_base.h index 09650de..f8b26ab 100644 --- a/media/filters/decoder_base.h +++ b/media/filters/decoder_base.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/stl_util-inl.h" #include "base/task.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/base/buffers.h" #include "media/base/callback.h" #include "media/base/filters.h" diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index b47b3c8..97631d4 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -5,7 +5,7 @@ #include <deque> #include "base/callback.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "media/base/filters.h" #include "media/base/mock_ffmpeg.h" #include "media/base/mock_filter_host.h" 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" |