chrome/common/extensions/api/sockets/sockets_manifest_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/api/sockets/sockets_manifest_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/api/plugins/plugins_handler.cc ('k') | chrome/common/extensions/api/speech/tts_engine_manifest_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/sockets/sockets_manifest_permission.cc

diff --git a/chrome/common/extensions/api/sockets/sockets_manifest_permission.cc b/chrome/common/extensions/api/sockets/sockets_manifest_permission.cc

index 6819861c104907fc2e39a073dce78eec6f77e8a2..61dc7197be5bd41c5c673ffa35e4cf1d352869d9 100644

--- a/chrome/common/extensions/api/sockets/sockets_manifest_permission.cc

+++ b/chrome/common/extensions/api/sockets/sockets_manifest_permission.cc

@@ -324,7 +324,7 @@ void SocketsManifestPermission::AddSubdomainHostMessage(

for (SocketPermissionEntrySet::const_iterator it = permissions_.begin();

it != permissions_.end(); ++it) {

if (it->GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS)

- domains.insert(UTF8ToUTF16(it->pattern().host));

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

}

if (!domains.empty()) {

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

@@ -346,7 +346,7 @@ void SocketsManifestPermission::AddSpecificHostMessage(

for (SocketPermissionEntrySet::const_iterator it = permissions_.begin();

it != permissions_.end(); ++it) {

if (it->GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS)

- hostnames.insert(UTF8ToUTF16(it->pattern().host));

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

}

if (!hostnames.empty()) {

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