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

Side by Side Diff: chrome/common/extensions/permissions/chrome_permission_message_rules.cc

Issue 1237873004: Revert of Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chrome_permission_message_rules.h " 5 #include "chrome/common/extensions/permissions/chrome_permission_message_rules.h "
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
11 #include "extensions/common/permissions/api_permission_set.h" 10 #include "extensions/common/permissions/api_permission_set.h"
12 #include "extensions/common/permissions/coalesced_permission_message.h" 11 #include "extensions/common/permissions/coalesced_permission_message.h"
13 #include "grit/extensions_strings.h" 12 #include "grit/extensions_strings.h"
14 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
15 14
16 namespace extensions { 15 namespace extensions {
17 16
18 namespace { 17 namespace {
19 18
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 int message_id_for_multiple_hosts) 91 int message_id_for_multiple_hosts)
93 : message_id_for_one_host_(message_id_for_one_host), 92 : message_id_for_one_host_(message_id_for_one_host),
94 message_id_for_multiple_hosts_(message_id_for_multiple_hosts) {} 93 message_id_for_multiple_hosts_(message_id_for_multiple_hosts) {}
95 ~SpaceSeparatedListFormatter() override {} 94 ~SpaceSeparatedListFormatter() override {}
96 95
97 CoalescedPermissionMessage GetPermissionMessage( 96 CoalescedPermissionMessage GetPermissionMessage(
98 PermissionIDSet permissions) const override { 97 PermissionIDSet permissions) const override {
99 DCHECK(permissions.size() > 0); 98 DCHECK(permissions.size() > 0);
100 std::vector<base::string16> hostnames = 99 std::vector<base::string16> hostnames =
101 permissions.GetAllPermissionParameters(); 100 permissions.GetAllPermissionParameters();
102 base::string16 hosts_string = 101 base::string16 hosts_string = JoinString(
103 base::JoinString(hostnames, base::ASCIIToUTF16(" ")); 102 std::vector<base::string16>(hostnames.begin(), hostnames.end()), ' ');
104 return CoalescedPermissionMessage( 103 return CoalescedPermissionMessage(
105 l10n_util::GetStringFUTF16(hostnames.size() == 1 104 l10n_util::GetStringFUTF16(hostnames.size() == 1
106 ? message_id_for_one_host_ 105 ? message_id_for_one_host_
107 : message_id_for_multiple_hosts_, 106 : message_id_for_multiple_hosts_,
108 hosts_string), 107 hosts_string),
109 permissions); 108 permissions);
110 } 109 }
111 110
112 private: 111 private:
113 int message_id_for_one_host_; 112 int message_id_for_one_host_;
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 insert(permission_four); 671 insert(permission_four);
673 insert(permission_five); 672 insert(permission_five);
674 insert(permission_six); 673 insert(permission_six);
675 } 674 }
676 675
677 ChromePermissionMessageRule::PermissionIDSetInitializer:: 676 ChromePermissionMessageRule::PermissionIDSetInitializer::
678 ~PermissionIDSetInitializer() { 677 ~PermissionIDSetInitializer() {
679 } 678 }
680 679
681 } // namespace extensions 680 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/command.cc ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698