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

Side by Side Diff: content/browser/geolocation/wifi_data_provider_common_win.cc

Issue 2192683003: Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2810
Patch Set: Created 4 years, 4 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/geolocation/wifi_data_provider_common_win.h" 5 #include "content/browser/geolocation/wifi_data_provider_common_win.h"
6 6
7 #include <assert.h> 7 #include <assert.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "device/geolocation/wifi_data_provider_common.h" 11 #include "content/browser/geolocation/wifi_data_provider_common.h"
12 12
13 namespace device { 13 namespace content {
14 14
15 bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data, 15 bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data,
16 AccessPointData *access_point_data) { 16 AccessPointData *access_point_data) {
17 // Currently we get only MAC address, signal strength and SSID. 17 // Currently we get only MAC address, signal strength and SSID.
18 // TODO(steveblock): Work out how to get age, channel and signal-to-noise. 18 // TODO(steveblock): Work out how to get age, channel and signal-to-noise.
19 DCHECK(access_point_data); 19 DCHECK(access_point_data);
20 access_point_data->mac_address = MacAddressAsString16(data.MacAddress); 20 access_point_data->mac_address = MacAddressAsString16(data.MacAddress);
21 access_point_data->radio_signal_strength = data.Rssi; 21 access_point_data->radio_signal_strength = data.Rssi;
22 // Note that _NDIS_802_11_SSID::Ssid::Ssid is not null-terminated. 22 // Note that _NDIS_802_11_SSID::Ssid::Ssid is not null-terminated.
23 base::UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid), 23 base::UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid),
(...skipping 23 matching lines...) Expand all
47 if (ConvertToAccessPointData(*bss_id, &access_point_data)) { 47 if (ConvertToAccessPointData(*bss_id, &access_point_data)) {
48 data->insert(access_point_data); 48 data->insert(access_point_data);
49 ++found; 49 ++found;
50 } 50 }
51 // Move to the next BSS ID. 51 // Move to the next BSS ID.
52 iterator += bss_id->Length; 52 iterator += bss_id->Length;
53 } 53 }
54 return found; 54 return found;
55 } 55 }
56 56
57 } // namespace device 57 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698