Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(523)

Side by Side 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 6 years, 12 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/extensions/permissions/socket_permission.h" 5 #include "chrome/common/extensions/permissions/socket_permission.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 return false; 49 return false;
50 } 50 }
51 51
52 void SocketPermission::AddSubdomainHostMessage( 52 void SocketPermission::AddSubdomainHostMessage(
53 PermissionMessages& messages) const { 53 PermissionMessages& messages) const {
54 std::set<base::string16> domains; 54 std::set<base::string16> domains;
55 std::set<SocketPermissionData>::const_iterator i; 55 std::set<SocketPermissionData>::const_iterator i;
56 for (i = data_set_.begin(); i != data_set_.end(); ++i) { 56 for (i = data_set_.begin(); i != data_set_.end(); ++i) {
57 if (i->entry().GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS) 57 if (i->entry().GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS)
58 domains.insert(UTF8ToUTF16(i->entry().pattern().host)); 58 domains.insert(base::UTF8ToUTF16(i->entry().pattern().host));
59 } 59 }
60 if (!domains.empty()) { 60 if (!domains.empty()) {
61 int id = (domains.size() == 1) ? 61 int id = (domains.size() == 1) ?
62 IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN : 62 IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN :
63 IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS; 63 IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS;
64 messages.push_back(PermissionMessage( 64 messages.push_back(PermissionMessage(
65 PermissionMessage::kSocketDomainHosts, 65 PermissionMessage::kSocketDomainHosts,
66 l10n_util::GetStringFUTF16( 66 l10n_util::GetStringFUTF16(
67 id, 67 id,
68 JoinString( 68 JoinString(
69 std::vector<base::string16>( 69 std::vector<base::string16>(
70 domains.begin(), domains.end()), ' ')))); 70 domains.begin(), domains.end()), ' '))));
71 } 71 }
72 } 72 }
73 73
74 void SocketPermission::AddSpecificHostMessage( 74 void SocketPermission::AddSpecificHostMessage(
75 PermissionMessages& messages) const { 75 PermissionMessages& messages) const {
76 std::set<base::string16> hostnames; 76 std::set<base::string16> hostnames;
77 std::set<SocketPermissionData>::const_iterator i; 77 std::set<SocketPermissionData>::const_iterator i;
78 for (i = data_set_.begin(); i != data_set_.end(); ++i) { 78 for (i = data_set_.begin(); i != data_set_.end(); ++i) {
79 if (i->entry().GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS) 79 if (i->entry().GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS)
80 hostnames.insert(UTF8ToUTF16(i->entry().pattern().host)); 80 hostnames.insert(base::UTF8ToUTF16(i->entry().pattern().host));
81 } 81 }
82 if (!hostnames.empty()) { 82 if (!hostnames.empty()) {
83 int id = (hostnames.size() == 1) ? 83 int id = (hostnames.size() == 1) ?
84 IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST : 84 IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST :
85 IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS; 85 IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS;
86 messages.push_back(PermissionMessage( 86 messages.push_back(PermissionMessage(
87 PermissionMessage::kSocketSpecificHosts, 87 PermissionMessage::kSocketSpecificHosts,
88 l10n_util::GetStringFUTF16( 88 l10n_util::GetStringFUTF16(
89 id, 89 id,
90 JoinString( 90 JoinString(
(...skipping 10 matching lines...) Expand all
101 content::SocketPermissionRequest::NETWORK_STATE) { 101 content::SocketPermissionRequest::NETWORK_STATE) {
102 messages.push_back(PermissionMessage( 102 messages.push_back(PermissionMessage(
103 PermissionMessage::kNetworkState, 103 PermissionMessage::kNetworkState,
104 l10n_util::GetStringUTF16( 104 l10n_util::GetStringUTF16(
105 IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE))); 105 IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE)));
106 } 106 }
107 } 107 }
108 } 108 }
109 109
110 } // namespace extensions 110 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698