diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:35:24 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 05:35:24 +0000 |
commit | fb441961d60063478f9c4e8cf57b9968f28e6aef (patch) | |
tree | 87666bee60c026723969d4749e6d3500467194c4 /media/video/capture/screen | |
parent | a15385f81cdeab34ce44b2f7648a162fcea371a3 (diff) | |
download | chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.zip chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.tar.gz chromium_src-fb441961d60063478f9c4e8cf57b9968f28e6aef.tar.bz2 |
Revert 198844 "Move sequenced_task_runner to base/task"
Reverting revisions that rely on r198820 so to unbreak the build.
> Move sequenced_task_runner to base/task
>
> BUG=
> R=akalin@chromium.org
>
> Review URL: https://codereview.chromium.org/14927008
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/14985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video/capture/screen')
-rw-r--r-- | media/video/capture/screen/screen_capture_device.cc | 2 | ||||
-rw-r--r-- | media/video/capture/screen/screen_capture_device_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/video/capture/screen/screen_capture_device.cc b/media/video/capture/screen/screen_capture_device.cc index 4bb5cc9..a4f55bd 100644 --- a/media/video/capture/screen/screen_capture_device.cc +++ b/media/video/capture/screen/screen_capture_device.cc @@ -7,8 +7,8 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" +#include "base/sequenced_task_runner.h" #include "base/synchronization/lock.h" -#include "base/task/sequenced_task_runner.h" #include "media/video/capture/screen/mouse_cursor_shape.h" #include "media/video/capture/screen/screen_capture_data.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/media/video/capture/screen/screen_capture_device_unittest.cc b/media/video/capture/screen/screen_capture_device_unittest.cc index b147fc0..6b74465 100644 --- a/media/video/capture/screen/screen_capture_device_unittest.cc +++ b/media/video/capture/screen/screen_capture_device_unittest.cc @@ -5,8 +5,8 @@ #include "media/video/capture/screen/screen_capture_device.h" #include "base/basictypes.h" +#include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" -#include "base/task/sequenced_task_runner.h" #include "base/test/test_timeouts.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time.h" |