Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // Implements a WLAN API binding for CoreWLAN, as available on OSX 10.6 | 5 // Implements a WLAN API binding for CoreWLAN, as available on OSX 10.6 |
| 6 | 6 |
| 7 #include "content/browser/geolocation/wifi_data_provider_mac.h" | 7 #include "content/browser/geolocation/wifi_data_provider_mac.h" |
| 8 | 8 |
| 9 #include <dlfcn.h> | 9 #include <dlfcn.h> |
| 10 #import <Foundation/Foundation.h> | 10 #import <Foundation/Foundation.h> |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 151 | 151 |
| 152 for (CWNetwork* network in scan) { | 152 for (CWNetwork* network in scan) { |
| 153 DCHECK(network); | 153 DCHECK(network); |
| 154 AccessPointData access_point_data; | 154 AccessPointData access_point_data; |
| 155 NSData* mac = [network bssidData]; | 155 NSData* mac = [network bssidData]; |
| 156 DCHECK([mac length] == 6); | 156 DCHECK([mac length] == 6); |
| 157 if (![mac bytes]) | 157 if (![mac bytes]) |
| 158 continue; // crbug.com/545501 | 158 continue; // crbug.com/545501 |
| 159 access_point_data.mac_address = | 159 access_point_data.mac_address = |
| 160 MacAddressAsString16(static_cast<const uint8_t*>([mac bytes])); | 160 MacAddressAsString16(static_cast<const uint8_t*>([mac bytes])); |
| 161 access_point_data.radio_signal_strength = [[network rssi] intValue]; | 161 access_point_data.radio_signal_strength = [network rssiValue]; |
|
Michael van Ouwerkerk
2016/03/09 10:09:45
According to the try bots this does not work:
../
| |
| 162 access_point_data.channel = [[network channel] intValue]; | 162 access_point_data.channel = [[network channel] intValue]; |
| 163 access_point_data.signal_to_noise = | 163 access_point_data.signal_to_noise = |
| 164 access_point_data.radio_signal_strength - [[network noise] intValue]; | 164 access_point_data.radio_signal_strength - [[network noise] intValue]; |
| 165 access_point_data.ssid = base::SysNSStringToUTF16([network ssid]); | 165 access_point_data.ssid = base::SysNSStringToUTF16([network ssid]); |
| 166 data->insert(access_point_data); | 166 data->insert(access_point_data); |
| 167 } | 167 } |
| 168 } | 168 } |
| 169 | 169 |
| 170 UMA_HISTOGRAM_CUSTOM_COUNTS( | 170 UMA_HISTOGRAM_CUSTOM_COUNTS( |
| 171 "Net.Wifi.InterfaceCount", | 171 "Net.Wifi.InterfaceCount", |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 182 | 182 |
| 183 WifiDataProviderCommon::WlanApiInterface* NewCoreWlanApi() { | 183 WifiDataProviderCommon::WlanApiInterface* NewCoreWlanApi() { |
| 184 scoped_ptr<CoreWlanApi> self(new CoreWlanApi); | 184 scoped_ptr<CoreWlanApi> self(new CoreWlanApi); |
| 185 if (self->Init()) | 185 if (self->Init()) |
| 186 return self.release(); | 186 return self.release(); |
| 187 | 187 |
| 188 return NULL; | 188 return NULL; |
| 189 } | 189 } |
| 190 | 190 |
| 191 } // namespace content | 191 } // namespace content |
| OLD | NEW |