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

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

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | Annotate | Revision Log
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 "content/browser/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 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/geolocation/wifi_data_provider_common.h" 10 #include "content/browser/geolocation/wifi_data_provider_common.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data, 14 bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data,
15 AccessPointData *access_point_data) { 15 AccessPointData *access_point_data) {
16 // Currently we get only MAC address, signal strength and SSID. 16 // Currently we get only MAC address, signal strength and SSID.
17 // TODO(steveblock): Work out how to get age, channel and signal-to-noise. 17 // TODO(steveblock): Work out how to get age, channel and signal-to-noise.
18 DCHECK(access_point_data); 18 DCHECK(access_point_data);
19 access_point_data->mac_address = MacAddressAsString16(data.MacAddress); 19 access_point_data->mac_address = MacAddressAsString16(data.MacAddress);
20 access_point_data->radio_signal_strength = data.Rssi; 20 access_point_data->radio_signal_strength = data.Rssi;
21 // Note that _NDIS_802_11_SSID::Ssid::Ssid is not null-terminated. 21 // Note that _NDIS_802_11_SSID::Ssid::Ssid is not null-terminated.
22 UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid), 22 base::UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid),
23 data.Ssid.SsidLength, 23 data.Ssid.SsidLength,
24 &access_point_data->ssid); 24 &access_point_data->ssid);
25 return true; 25 return true;
26 } 26 }
27 27
28 int GetDataFromBssIdList(const NDIS_802_11_BSSID_LIST& bss_id_list, 28 int GetDataFromBssIdList(const NDIS_802_11_BSSID_LIST& bss_id_list,
29 int list_size, 29 int list_size,
30 WifiData::AccessPointDataSet* data) { 30 WifiData::AccessPointDataSet* data) {
31 // Walk through the BSS IDs. 31 // Walk through the BSS IDs.
32 int found = 0; 32 int found = 0;
33 const uint8 *iterator = reinterpret_cast<const uint8*>(&bss_id_list.Bssid[0]); 33 const uint8 *iterator = reinterpret_cast<const uint8*>(&bss_id_list.Bssid[0]);
34 const uint8 *end_of_buffer = 34 const uint8 *end_of_buffer =
(...skipping 11 matching lines...) Expand all
46 data->insert(access_point_data); 46 data->insert(access_point_data);
47 ++found; 47 ++found;
48 } 48 }
49 // Move to the next BSS ID. 49 // Move to the next BSS ID.
50 iterator += bss_id->Length; 50 iterator += bss_id->Length;
51 } 51 }
52 return found; 52 return found;
53 } 53 }
54 54
55 } // namespace content 55 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698