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 /device | |
| 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 'device')
4 files changed, 6 insertions, 6 deletions
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm index 7146bdf..00d6737 100644 --- a/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm @@ -4,8 +4,8 @@ #include "device/bluetooth/bluetooth_adapter_mac.h" -#import <IOBluetooth/objc/IOBluetoothDevice.h> #import <IOBluetooth/objc/IOBluetoothDeviceInquiry.h> +#import <IOBluetooth/objc/IOBluetoothDevice.h> #import <IOBluetooth/objc/IOBluetoothHostController.h> #include <string> @@ -15,11 +15,11 @@ #include "base/hash_tables.h" #include "base/location.h" #include "base/memory/scoped_ptr.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" -#include "base/strings/sys_string_conversions.h" -#include "base/task/sequenced_task_runner.h" #include "base/thread_task_runner_handle.h" #include "base/time.h" +#include "base/strings/sys_string_conversions.h" #include "device/bluetooth/bluetooth_device_mac.h" // Replicate specific 10.7 SDK declarations for building with prior SDKs. diff --git a/device/bluetooth/bluetooth_adapter_win.cc b/device/bluetooth/bluetooth_adapter_win.cc index 3dbdee0..f6ca1d6 100644 --- a/device/bluetooth/bluetooth_adapter_win.cc +++ b/device/bluetooth/bluetooth_adapter_win.cc @@ -9,9 +9,9 @@ #include <utility> #include "base/logging.h" +#include "base/sequenced_task_runner.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/thread_task_runner_handle.h" #include "device/bluetooth/bluetooth_device_win.h" #include "device/bluetooth/bluetooth_task_manager_win.h" diff --git a/device/bluetooth/bluetooth_task_manager_win.cc b/device/bluetooth/bluetooth_task_manager_win.cc index ad9046f..2fca071 100644 --- a/device/bluetooth/bluetooth_task_manager_win.cc +++ b/device/bluetooth/bluetooth_task_manager_win.cc @@ -13,9 +13,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" +#include "base/sequenced_task_runner.h" #include "base/stringprintf.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_worker_pool.h" #include "base/win/scoped_handle.h" #include "device/bluetooth/bluetooth_init_win.h" diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc index c25a3d5..869e924 100644 --- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc +++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc @@ -14,8 +14,8 @@ #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/sequenced_task_runner.h" #include "base/stl_util.h" -#include "base/task/sequenced_task_runner.h" #include "base/threading/thread_checker.h" #include "dbus/bus.h" #include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h" |