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

Index: content/browser/geolocation/wifi_data_provider_mac.cc

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

index e7d8e8247f9bf2261240d817b4b3878dbab46a40..6a87801c893cde0ac6943ae82ff49bf202f6739a 100644

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

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

@@ -140,9 +140,10 @@ bool Apple80211Api::GetAccessPointData(WifiData::AccessPointDataSet* data) {

// WirelessNetworkInfo::noise appears to be noise floor in dBm.

access_point_data.signal_to_noise = access_point_info->signal -

access_point_info->noise;

- if (!UTF8ToUTF16(reinterpret_cast<const char*>(access_point_info->name),

- access_point_info->nameLen,

- &access_point_data.ssid)) {

+ if (!base::UTF8ToUTF16(reinterpret_cast<const char*>(

+ access_point_info->name),

+ access_point_info->nameLen,

+ &access_point_data.ssid)) {

access_point_data.ssid.clear();

}

data->insert(access_point_data);