content/browser/geolocation/wifi_data_provider_common_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_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 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_common_unittest.cc ('k') | content/browser/geolocation/wifi_data_provider_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/geolocation/wifi_data_provider_common_win.cc

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

index a0d334f0c4496f2d06a4434e6a9b834870204e71..aac728d4ec064504190708920bdd855207ec86b4 100644

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

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

@@ -19,9 +19,9 @@ bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data,

access_point_data->mac_address = MacAddressAsString16(data.MacAddress);

access_point_data->radio_signal_strength = data.Rssi;

// Note that _NDIS_802_11_SSID::Ssid::Ssid is not null-terminated.

- UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid),

- data.Ssid.SsidLength,

- &access_point_data->ssid);

+ base::UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid),

+ data.Ssid.SsidLength,

+ &access_point_data->ssid);

return true;

}