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

Side by Side Diff: device/bluetooth/bluetooth_adapter_factory.cc

Issue 2384463002: bluetooth: mac: Reject requestDevice promise if Mac version is <= 10.9 (Closed)
Patch Set: Add missing #if defined(OS_MACOSX) Created 4 years, 2 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
OLDNEW
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_factory.h" 5 #include "device/bluetooth/bluetooth_adapter_factory.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #if defined(OS_MACOSX)
dcheng 2016/10/05 08:56:48 Nit: platform-specific includes guarded by conditi
12 #include "base/mac/mac_util.h"
13 #endif
11 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
12 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
13 #include "build/build_config.h" 16 #include "build/build_config.h"
14 #include "device/bluetooth/bluetooth_adapter.h" 17 #include "device/bluetooth/bluetooth_adapter.h"
15 18
16 namespace device { 19 namespace device {
17 20
18 namespace { 21 namespace {
19 22
20 // Shared default adapter instance. We don't want to keep this class around 23 // Shared default adapter instance. We don't want to keep this class around
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 return true; 60 return true;
58 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ 61 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
59 defined(OS_LINUX) || defined(OS_MACOSX) 62 defined(OS_LINUX) || defined(OS_MACOSX)
60 return true; 63 return true;
61 #else 64 #else
62 return false; 65 return false;
63 #endif 66 #endif
64 } 67 }
65 68
66 // static 69 // static
70 bool BluetoothAdapterFactory::IsLowEnergyAvailable() {
71 DCHECK(IsBluetoothAdapterAvailable());
72
73 // SetAdapterForTesting() may be used to provide a test or mock adapter
74 // instance even on platforms that would otherwise not support it.
75 if (default_adapter.Get())
76 return true;
77 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) || \
78 defined(OS_LINUX)
79 return true;
80 #elif defined(OS_MACOSX)
81 return base::mac::IsAtLeastOS10_10();
82 #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_WIN) ||
83 // defined(OS_LINUX)
84 return false;
85 }
86
87 // static
67 void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) { 88 void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
68 DCHECK(IsBluetoothAdapterAvailable()); 89 DCHECK(IsBluetoothAdapterAvailable());
69 90
70 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) 91 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
71 if (!default_adapter.Get()) { 92 if (!default_adapter.Get()) {
72 default_adapter.Get() = 93 default_adapter.Get() =
73 BluetoothAdapter::CreateAdapter(base::Bind(&RunAdapterCallbacks)); 94 BluetoothAdapter::CreateAdapter(base::Bind(&RunAdapterCallbacks));
74 DCHECK(!default_adapter.Get()->IsInitialized()); 95 DCHECK(!default_adapter.Get()->IsInitialized());
75 } 96 }
76 97
(...skipping 25 matching lines...) Expand all
102 scoped_refptr<BluetoothAdapter> adapter) { 123 scoped_refptr<BluetoothAdapter> adapter) {
103 default_adapter.Get() = adapter->GetWeakPtrForTesting(); 124 default_adapter.Get() = adapter->GetWeakPtrForTesting();
104 } 125 }
105 126
106 // static 127 // static
107 bool BluetoothAdapterFactory::HasSharedInstanceForTesting() { 128 bool BluetoothAdapterFactory::HasSharedInstanceForTesting() {
108 return default_adapter.Get() != nullptr; 129 return default_adapter.Get() != nullptr;
109 } 130 }
110 131
111 } // namespace device 132 } // namespace device
OLDNEW
« no previous file with comments | « device/bluetooth/bluetooth_adapter_factory.h ('k') | device/bluetooth/bluetooth_adapter_factory_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698