diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 04:14:58 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 04:14:58 +0000 |
commit | 002c726a0d895fa10131d8a3a3ec453ca7f123f3 (patch) | |
tree | 59cfd9ce225e64a2e8a4052ad10096dfa2ccc440 /device/bluetooth | |
parent | 8a738caac31a57999c6a6d8d77f3a14d633687b6 (diff) | |
download | chromium_src-002c726a0d895fa10131d8a3a3ec453ca7f123f3.zip chromium_src-002c726a0d895fa10131d8a3a3ec453ca7f123f3.tar.gz chromium_src-002c726a0d895fa10131d8a3a3ec453ca7f123f3.tar.bz2 |
Move sequenced_task_runner to base/task
BUG=
R=akalin@chromium.org
Review URL: https://codereview.chromium.org/14927008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth')
-rw-r--r-- | device/bluetooth/bluetooth_adapter_mac.mm | 6 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_adapter_win.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_task_manager_win.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm index 00d6737..7146bdf 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/IOBluetoothDeviceInquiry.h> #import <IOBluetooth/objc/IOBluetoothDevice.h> +#import <IOBluetooth/objc/IOBluetoothDeviceInquiry.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 f6ca1d6..3dbdee0 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 2fca071..ad9046f 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" |