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

Index: content/browser/geolocation/network_location_request.cc

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

index 3ed709218fe33388a5d823588a4bf4b9df9f36db..8fb6e6a907621b9382f7828b031a9886ed6fdb40 100644

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

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

@@ -262,7 +262,7 @@ void AddWifiData(const WifiData& wifi_data,

iter != access_points_by_signal_strength.end();

++iter) {

base::DictionaryValue* wifi_dict = new base::DictionaryValue();

- AddString("macAddress", UTF16ToUTF8((*iter)->mac_address), wifi_dict);

+ AddString("macAddress", base::UTF16ToUTF8((*iter)->mac_address), wifi_dict);

AddInteger("signalStrength", (*iter)->radio_signal_strength, wifi_dict);

AddInteger("age", age_milliseconds, wifi_dict);

AddInteger("channel", (*iter)->channel, wifi_dict);