chrome/common/extensions/permissions/socket_permission.cc - Issue 93793010: Update uses of UTF conversions in chrome/common 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: chrome/common/extensions/permissions/socket_permission.cc

Issue 93793010: Update uses of UTF conversions in chrome/common 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 | « chrome/common/extensions/permissions/settings_override_permission_unittest.cc ('k') | chrome/common/extensions/permissions/usb_device_permission.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/socket_permission.cc

diff --git a/chrome/common/extensions/permissions/socket_permission.cc b/chrome/common/extensions/permissions/socket_permission.cc

index 5e8fd644d25674c6829c94b452e2a25f3888ee8b..6c0812777afba618da09a078ad4bc9498a5a6711 100644

--- a/chrome/common/extensions/permissions/socket_permission.cc

+++ b/chrome/common/extensions/permissions/socket_permission.cc

@@ -55,7 +55,7 @@ void SocketPermission::AddSubdomainHostMessage(

std::set<SocketPermissionData>::const_iterator i;

for (i = data_set_.begin(); i != data_set_.end(); ++i) {

if (i->entry().GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS)

- domains.insert(UTF8ToUTF16(i->entry().pattern().host));

+ domains.insert(base::UTF8ToUTF16(i->entry().pattern().host));

}

if (!domains.empty()) {

int id = (domains.size() == 1) ?

@@ -77,7 +77,7 @@ void SocketPermission::AddSpecificHostMessage(

std::set<SocketPermissionData>::const_iterator i;

for (i = data_set_.begin(); i != data_set_.end(); ++i) {

if (i->entry().GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS)

- hostnames.insert(UTF8ToUTF16(i->entry().pattern().host));

+ hostnames.insert(base::UTF8ToUTF16(i->entry().pattern().host));

}

if (!hostnames.empty()) {

int id = (hostnames.size() == 1) ?