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

Side by Side 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 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/api/sockets/sockets_manifest_permission.h" 5 #include "chrome/common/extensions/api/sockets/sockets_manifest_permission.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/extensions/api/manifest_types.h" 10 #include "chrome/common/extensions/api/manifest_types.h"
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 } 317 }
318 return false; 318 return false;
319 } 319 }
320 320
321 void SocketsManifestPermission::AddSubdomainHostMessage( 321 void SocketsManifestPermission::AddSubdomainHostMessage(
322 PermissionMessages& messages) const { 322 PermissionMessages& messages) const {
323 std::set<base::string16> domains; 323 std::set<base::string16> domains;
324 for (SocketPermissionEntrySet::const_iterator it = permissions_.begin(); 324 for (SocketPermissionEntrySet::const_iterator it = permissions_.begin();
325 it != permissions_.end(); ++it) { 325 it != permissions_.end(); ++it) {
326 if (it->GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS) 326 if (it->GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS)
327 domains.insert(UTF8ToUTF16(it->pattern().host)); 327 domains.insert(base::UTF8ToUTF16(it->pattern().host));
328 } 328 }
329 if (!domains.empty()) { 329 if (!domains.empty()) {
330 int id = (domains.size() == 1) ? 330 int id = (domains.size() == 1) ?
331 IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN : 331 IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN :
332 IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS; 332 IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS;
333 messages.push_back(PermissionMessage( 333 messages.push_back(PermissionMessage(
334 PermissionMessage::kSocketDomainHosts, 334 PermissionMessage::kSocketDomainHosts,
335 l10n_util::GetStringFUTF16( 335 l10n_util::GetStringFUTF16(
336 id, 336 id,
337 JoinString( 337 JoinString(
338 std::vector<base::string16>( 338 std::vector<base::string16>(
339 domains.begin(), domains.end()), ' ')))); 339 domains.begin(), domains.end()), ' '))));
340 } 340 }
341 } 341 }
342 342
343 void SocketsManifestPermission::AddSpecificHostMessage( 343 void SocketsManifestPermission::AddSpecificHostMessage(
344 PermissionMessages& messages) const { 344 PermissionMessages& messages) const {
345 std::set<base::string16> hostnames; 345 std::set<base::string16> hostnames;
346 for (SocketPermissionEntrySet::const_iterator it = permissions_.begin(); 346 for (SocketPermissionEntrySet::const_iterator it = permissions_.begin();
347 it != permissions_.end(); ++it) { 347 it != permissions_.end(); ++it) {
348 if (it->GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS) 348 if (it->GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS)
349 hostnames.insert(UTF8ToUTF16(it->pattern().host)); 349 hostnames.insert(base::UTF8ToUTF16(it->pattern().host));
350 } 350 }
351 if (!hostnames.empty()) { 351 if (!hostnames.empty()) {
352 int id = (hostnames.size() == 1) ? 352 int id = (hostnames.size() == 1) ?
353 IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST : 353 IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST :
354 IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS; 354 IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS;
355 messages.push_back(PermissionMessage( 355 messages.push_back(PermissionMessage(
356 PermissionMessage::kSocketSpecificHosts, 356 PermissionMessage::kSocketSpecificHosts,
357 l10n_util::GetStringFUTF16( 357 l10n_util::GetStringFUTF16(
358 id, 358 id,
359 JoinString( 359 JoinString(
360 std::vector<base::string16>( 360 std::vector<base::string16>(
361 hostnames.begin(), hostnames.end()), ' ')))); 361 hostnames.begin(), hostnames.end()), ' '))));
362 } 362 }
363 } 363 }
364 364
365 void SocketsManifestPermission::AddNetworkListMessage( 365 void SocketsManifestPermission::AddNetworkListMessage(
366 PermissionMessages& messages) const { 366 PermissionMessages& messages) const {
367 for (SocketPermissionEntrySet::const_iterator it = permissions_.begin(); 367 for (SocketPermissionEntrySet::const_iterator it = permissions_.begin();
368 it != permissions_.end(); ++it) { 368 it != permissions_.end(); ++it) {
369 if (it->pattern().type == SocketPermissionRequest::NETWORK_STATE) { 369 if (it->pattern().type == SocketPermissionRequest::NETWORK_STATE) {
370 messages.push_back(PermissionMessage( 370 messages.push_back(PermissionMessage(
371 PermissionMessage::kNetworkState, 371 PermissionMessage::kNetworkState,
372 l10n_util::GetStringUTF16( 372 l10n_util::GetStringUTF16(
373 IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE))); 373 IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE)));
374 } 374 }
375 } 375 }
376 } 376 }
377 377
378 } // namespace extensions 378 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698