| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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.h" | 5 #include "device/bluetooth/bluetooth_adapter.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
| 9 #include "device/bluetooth/bluetooth_device.h" | 9 #include "device/bluetooth/bluetooth_device.h" |
| 10 #include "device/bluetooth/bluetooth_discovery_session.h" | 10 #include "device/bluetooth/bluetooth_discovery_session.h" |
| 11 | 11 |
| 12 namespace device { | 12 namespace device { |
| 13 | 13 |
| 14 BluetoothAdapter::ServiceOptions::ServiceOptions() { | 14 BluetoothAdapter::ServiceOptions::ServiceOptions() { |
| 15 } | 15 } |
| 16 BluetoothAdapter::ServiceOptions::~ServiceOptions() { | 16 BluetoothAdapter::ServiceOptions::~ServiceOptions() { |
| 17 } | 17 } |
| 18 | 18 |
| 19 #if !defined(OS_CHROMEOS) && !defined(OS_WIN) && !defined(OS_MACOSX) | 19 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ |
| 20 !defined(OS_WIN) |
| 20 //static | 21 //static |
| 21 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::CreateAdapter( | 22 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::CreateAdapter( |
| 22 const InitCallback& init_callback) { | 23 const InitCallback& init_callback) { |
| 23 return base::WeakPtr<BluetoothAdapter>(); | 24 return base::WeakPtr<BluetoothAdapter>(); |
| 24 } | 25 } |
| 25 #endif // !defined(OS_CHROMEOS) && !defined(OS_WIN) && !defined(OS_MACOSX) | 26 #endif // !defined(OS_CHROMEOS) && !defined(OS_WIN) && !defined(OS_MACOSX) |
| 26 | 27 |
| 27 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::GetWeakPtrForTesting() { | 28 base::WeakPtr<BluetoothAdapter> BluetoothAdapter::GetWeakPtrForTesting() { |
| 28 return weak_ptr_factory_.GetWeakPtr(); | 29 return weak_ptr_factory_.GetWeakPtr(); |
| 29 } | 30 } |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 continue; | 218 continue; |
| 218 } | 219 } |
| 219 | 220 |
| 220 result = BluetoothDiscoveryFilter::Merge(result.get(), curr_filter); | 221 result = BluetoothDiscoveryFilter::Merge(result.get(), curr_filter); |
| 221 } | 222 } |
| 222 | 223 |
| 223 return result.Pass(); | 224 return result.Pass(); |
| 224 } | 225 } |
| 225 | 226 |
| 226 } // namespace device | 227 } // namespace device |
| OLD | NEW |