Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: trunk/src/device/bluetooth/bluetooth_adapter_mac.mm

Issue 14985007: Revert 198844 "Move sequenced_task_runner to base/task" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/bluetooth/bluetooth_adapter_mac.h" 5 #include "device/bluetooth/bluetooth_adapter_mac.h"
6 6
7 #import <IOBluetooth/objc/IOBluetoothDeviceInquiry.h>
7 #import <IOBluetooth/objc/IOBluetoothDevice.h> 8 #import <IOBluetooth/objc/IOBluetoothDevice.h>
8 #import <IOBluetooth/objc/IOBluetoothDeviceInquiry.h>
9 #import <IOBluetooth/objc/IOBluetoothHostController.h> 9 #import <IOBluetooth/objc/IOBluetoothHostController.h>
10 10
11 #include <string> 11 #include <string>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/hash_tables.h" 15 #include "base/hash_tables.h"
16 #include "base/location.h" 16 #include "base/location.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/sequenced_task_runner.h"
18 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
19 #include "base/strings/sys_string_conversions.h"
20 #include "base/task/sequenced_task_runner.h"
21 #include "base/thread_task_runner_handle.h" 20 #include "base/thread_task_runner_handle.h"
22 #include "base/time.h" 21 #include "base/time.h"
22 #include "base/strings/sys_string_conversions.h"
23 #include "device/bluetooth/bluetooth_device_mac.h" 23 #include "device/bluetooth/bluetooth_device_mac.h"
24 24
25 // Replicate specific 10.7 SDK declarations for building with prior SDKs. 25 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
26 #if !defined(MAC_OS_X_VERSION_10_7) || \ 26 #if !defined(MAC_OS_X_VERSION_10_7) || \
27 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 27 MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
28 28
29 @interface IOBluetoothHostController (LionSDKDeclarations) 29 @interface IOBluetoothHostController (LionSDKDeclarations)
30 - (NSString*)nameAsString; 30 - (NSString*)nameAsString;
31 - (BluetoothHCIPowerState)powerState; 31 - (BluetoothHCIPowerState)powerState;
32 @end 32 @end
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 iter != callback_list.end(); 330 iter != callback_list.end();
331 ++iter) { 331 ++iter) {
332 if (success) 332 if (success)
333 ui_task_runner_->PostTask(FROM_HERE, iter->first); 333 ui_task_runner_->PostTask(FROM_HERE, iter->first);
334 else 334 else
335 ui_task_runner_->PostTask(FROM_HERE, iter->second); 335 ui_task_runner_->PostTask(FROM_HERE, iter->second);
336 } 336 }
337 } 337 }
338 338
339 } // namespace device 339 } // namespace device
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/webplugin_delegate_proxy.h ('k') | trunk/src/device/bluetooth/bluetooth_adapter_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698