OLD | NEW |
---|---|
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 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_ | 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_ |
6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_ | 6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <queue> | 9 #include <queue> |
10 #include <string> | 10 #include <string> |
11 #include <utility> | 11 #include <utility> |
12 #include <vector> | 12 #include <vector> |
13 | 13 |
14 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
15 #include "base/sequenced_task_runner.h" | |
16 #include "chromeos/dbus/bluetooth_adapter_client.h" | 15 #include "chromeos/dbus/bluetooth_adapter_client.h" |
17 #include "chromeos/dbus/bluetooth_agent_service_provider.h" | 16 #include "chromeos/dbus/bluetooth_agent_service_provider.h" |
18 #include "chromeos/dbus/bluetooth_device_client.h" | 17 #include "chromeos/dbus/bluetooth_device_client.h" |
19 #include "chromeos/dbus/bluetooth_input_client.h" | 18 #include "chromeos/dbus/bluetooth_input_client.h" |
20 #include "chromeos/dbus/bluetooth_profile_manager_client.h" | 19 #include "chromeos/dbus/bluetooth_profile_manager_client.h" |
21 #include "chromeos/dbus/bluetooth_profile_service_provider.h" | 20 #include "chromeos/dbus/bluetooth_profile_service_provider.h" |
22 #include "dbus/object_path.h" | 21 #include "dbus/object_path.h" |
23 #include "device/bluetooth/bluetooth_adapter.h" | 22 #include "device/bluetooth/bluetooth_adapter.h" |
24 #include "device/bluetooth/bluetooth_audio_sink.h" | 23 #include "device/bluetooth/bluetooth_audio_sink.h" |
25 #include "device/bluetooth/bluetooth_device.h" | 24 #include "device/bluetooth/bluetooth_device.h" |
26 #include "device/bluetooth/bluetooth_discovery_session.h" | 25 #include "device/bluetooth/bluetooth_discovery_session.h" |
27 #include "device/bluetooth/bluetooth_export.h" | 26 #include "device/bluetooth/bluetooth_export.h" |
28 | 27 |
28 namespace base { | |
29 class SequencedTaskRunner; | |
30 } // namespace base | |
armansito
2015/04/29 01:17:28
Is this a fly-by fix? Better to put it in its own
scheib
2015/04/29 01:35:14
Done. https://codereview.chromium.org/1111153002/
| |
31 | |
29 namespace device { | 32 namespace device { |
30 class BluetoothSocketThread; | 33 class BluetoothSocketThread; |
31 } // namespace device | 34 } // namespace device |
32 | 35 |
33 namespace chromeos { | 36 namespace chromeos { |
34 | 37 |
35 class BluetoothChromeOSTest; | 38 class BluetoothChromeOSTest; |
36 class BluetoothAdapterProfileChromeOS; | 39 class BluetoothAdapterProfileChromeOS; |
37 class BluetoothDeviceChromeOS; | 40 class BluetoothDeviceChromeOS; |
38 class BluetoothPairingChromeOS; | 41 class BluetoothPairingChromeOS; |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
374 // Note: This should remain the last member so it'll be destroyed and | 377 // Note: This should remain the last member so it'll be destroyed and |
375 // invalidate its weak pointers before any other members are destroyed. | 378 // invalidate its weak pointers before any other members are destroyed. |
376 base::WeakPtrFactory<BluetoothAdapterChromeOS> weak_ptr_factory_; | 379 base::WeakPtrFactory<BluetoothAdapterChromeOS> weak_ptr_factory_; |
377 | 380 |
378 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOS); | 381 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOS); |
379 }; | 382 }; |
380 | 383 |
381 } // namespace chromeos | 384 } // namespace chromeos |
382 | 385 |
383 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_ | 386 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_ |
OLD | NEW |