OLD | NEW |
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 "extensions/common/permissions/permission_message_util.h" | 5 #include "extensions/common/permissions/permission_message_util.h" |
6 | 6 |
7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "extensions/common/permissions/permission_message.h" | 9 #include "extensions/common/permissions/permission_message.h" |
10 #include "extensions/common/permissions/permission_set.h" | 10 #include "extensions/common/permissions/permission_set.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 ? l10n_util::GetStringFUTF16(host_msg_id, | 62 ? l10n_util::GetStringFUTF16(host_msg_id, |
63 base::UTF8ToUTF16(host.erase(0, 2))) | 63 base::UTF8ToUTF16(host.erase(0, 2))) |
64 : base::UTF8ToUTF16(host)); | 64 : base::UTF8ToUTF16(host)); |
65 } | 65 } |
66 DCHECK(host_list.size()); | 66 DCHECK(host_list.size()); |
67 | 67 |
68 if (host_list.size() < arraysize(kMessagesList)) { | 68 if (host_list.size() < arraysize(kMessagesList)) { |
69 return PermissionMessage( | 69 return PermissionMessage( |
70 kMessagesList[host_list.size() - 1].first, | 70 kMessagesList[host_list.size() - 1].first, |
71 l10n_util::GetStringFUTF16( | 71 l10n_util::GetStringFUTF16( |
72 kMessagesList[host_list.size() - 1].second, host_list, NULL)); | 72 kMessagesList[host_list.size() - 1].second, host_list, nullptr)); |
73 } | 73 } |
74 | 74 |
75 base::string16 details; | 75 base::string16 details; |
76 for (size_t i = 0; i < host_list.size(); ++i) { | 76 for (size_t i = 0; i < host_list.size(); ++i) { |
77 if (i > 0) | 77 if (i > 0) |
78 details += base::ASCIIToUTF16("\n"); | 78 details += base::ASCIIToUTF16("\n"); |
79 details += l10n_util::GetStringFUTF16( | 79 details += l10n_util::GetStringFUTF16( |
80 IDS_EXTENSION_PROMPT_WARNING_HOST_LIST_ENTRY, host_list[i]); | 80 IDS_EXTENSION_PROMPT_WARNING_HOST_LIST_ENTRY, host_list[i]); |
81 } | 81 } |
82 return PermissionMessage( | 82 return PermissionMessage( |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 // Build up the final vector by concatenating hosts and RCDs. | 136 // Build up the final vector by concatenating hosts and RCDs. |
137 std::set<std::string> distinct_hosts; | 137 std::set<std::string> distinct_hosts; |
138 for (HostVector::iterator it = hosts_best_rcd.begin(); | 138 for (HostVector::iterator it = hosts_best_rcd.begin(); |
139 it != hosts_best_rcd.end(); | 139 it != hosts_best_rcd.end(); |
140 ++it) | 140 ++it) |
141 distinct_hosts.insert(it->first + it->second); | 141 distinct_hosts.insert(it->first + it->second); |
142 return distinct_hosts; | 142 return distinct_hosts; |
143 } | 143 } |
144 | 144 |
145 } // namespace permission_message_util | 145 } // namespace permission_message_util |
OLD | NEW |