content/browser/geolocation/wifi_data_provider_win.cc - Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/geolocation/wifi_data_provider_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 7 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/geolocation/wifi_data_provider_mac.cc ('k') | content/browser/indexed_db/indexed_db_backing_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/geolocation/wifi_data_provider_win.cc

diff --git a/content/browser/geolocation/wifi_data_provider_win.cc b/content/browser/geolocation/wifi_data_provider_win.cc

index ed69865fbd0814ea27f7bd6c53ec1a23834babfc..a4e6e7408db5c5e796e2f2ebfc83f9ede1f02804 100644

--- a/content/browser/geolocation/wifi_data_provider_win.cc

+++ b/content/browser/geolocation/wifi_data_provider_win.cc

@@ -520,9 +520,9 @@ bool GetNetworkData(const WLAN_BSS_ENTRY& bss_entry,

access_point_data->mac_address = MacAddressAsString16(bss_entry.dot11Bssid);

access_point_data->radio_signal_strength = bss_entry.lRssi;

// bss_entry.dot11Ssid.ucSSID is not null-terminated.

- UTF8ToUTF16(reinterpret_cast<const char*>(bss_entry.dot11Ssid.ucSSID),

- static_cast<ULONG>(bss_entry.dot11Ssid.uSSIDLength),

- &access_point_data->ssid);

+ base::UTF8ToUTF16(reinterpret_cast<const char*>(bss_entry.dot11Ssid.ucSSID),

+ static_cast<ULONG>(bss_entry.dot11Ssid.uSSIDLength),

+ &access_point_data->ssid);

// TODO(steveblock): Is it possible to get the following?

// access_point_data->signal_to_noise

// access_point_data->age