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

Index: content/browser/geolocation/wifi_data_provider_linux.cc

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

index a8d2135fc92d4fd609556713c1c990a70250458a..1e4365822e4bc85a27ebac8711f6c8d53450a186 100644

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

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

@@ -254,7 +254,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter(

continue;

}

std::string ssid(ssid_bytes, ssid_bytes + ssid_length);

- access_point_data.ssid = UTF8ToUTF16(ssid);

+ access_point_data.ssid = base::UTF8ToUTF16(ssid);

}

{ // Read the mac address

@@ -275,7 +275,7 @@ bool NetworkManagerWlanApi::GetAccessPointsForAdapter(

if (!base::HexStringToBytes(mac, &mac_bytes) || mac_bytes.size() != 6) {

LOG(WARNING) << "Can't parse mac address (found " << mac_bytes.size()

<< " bytes) so using raw string: " << mac;

- access_point_data.mac_address = UTF8ToUTF16(mac);

+ access_point_data.mac_address = base::UTF8ToUTF16(mac);

} else {

access_point_data.mac_address = MacAddressAsString16(&mac_bytes[0]);

}