Chromium Code Reviews| Index: extensions/common/permissions/permission_message_util.cc |
| diff --git a/extensions/common/permissions/permission_message_util.cc b/extensions/common/permissions/permission_message_util.cc |
| index 0b2e1a9c038d6fba4e62590ecf20711cab511b6a..aeef651f025b9f7b47129ac7c9547c348120cd45 100644 |
| --- a/extensions/common/permissions/permission_message_util.cc |
| +++ b/extensions/common/permissions/permission_message_util.cc |
| @@ -37,7 +37,8 @@ bool RcdBetterThan(const std::string& a, const std::string& b) { |
| namespace permission_message_util { |
| -PermissionMessage CreateFromHostList(const std::set<std::string>& hosts) { |
| +PermissionMessage CreateFromHostList(const std::set<std::string>& hosts, |
| + bool read_only) { |
|
not at google - send to devlin
2014/07/23 01:56:59
bad news: this is all going to dramatically change
aboxhall
2014/07/24 17:32:39
Acknowledged.
|
| std::vector<std::string> host_list(hosts.begin(), hosts.end()); |
| DCHECK(host_list.size()); |
| PermissionMessage::ID message_id; |
| @@ -46,36 +47,61 @@ PermissionMessage CreateFromHostList(const std::set<std::string>& hosts) { |
| switch (host_list.size()) { |
| case 1: |
| - message_id = PermissionMessage::kHosts1; |
| - message = l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT_WARNING_1_HOST, |
| - base::UTF8ToUTF16(host_list[0])); |
| + message_id = read_only ? PermissionMessage::kHosts1ReadOnly |
| + : PermissionMessage::kHosts1; |
| + message = l10n_util::GetStringFUTF16( |
| + read_only ? IDS_EXTENSION_PROMPT_WARNING_1_HOST_READ_ONLY |
| + : IDS_EXTENSION_PROMPT_WARNING_1_HOST, |
| + base::UTF8ToUTF16(host_list[0])); |
| break; |
| case 2: |
| - message_id = PermissionMessage::kHosts2; |
| - message = l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT_WARNING_2_HOSTS, |
| - base::UTF8ToUTF16(host_list[0]), |
| - base::UTF8ToUTF16(host_list[1])); |
| + message_id = read_only ? PermissionMessage::kHosts2ReadOnly |
| + : PermissionMessage::kHosts2; |
| + message = l10n_util::GetStringFUTF16( |
| + read_only ? IDS_EXTENSION_PROMPT_WARNING_2_HOSTS_READ_ONLY |
| + : IDS_EXTENSION_PROMPT_WARNING_2_HOSTS, |
| + base::UTF8ToUTF16(host_list[0]), |
| + base::UTF8ToUTF16(host_list[1])); |
| break; |
| case 3: |
| - message_id = PermissionMessage::kHosts3; |
| - message = l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT_WARNING_3_HOSTS, |
| - base::UTF8ToUTF16(host_list[0]), |
| - base::UTF8ToUTF16(host_list[1]), |
| - base::UTF8ToUTF16(host_list[2])); |
| + message_id = read_only ? PermissionMessage::kHosts3ReadOnly |
| + : PermissionMessage::kHosts3; |
| + message = l10n_util::GetStringFUTF16( |
| + read_only ? IDS_EXTENSION_PROMPT_WARNING_3_HOSTS |
| + : IDS_EXTENSION_PROMPT_WARNING_3_HOSTS, |
| + base::UTF8ToUTF16(host_list[0]), |
| + base::UTF8ToUTF16(host_list[1]), |
| + base::UTF8ToUTF16(host_list[2])); |
| break; |
| default: |
| - message_id = PermissionMessage::kHosts4OrMore; |
| + message_id = read_only ? PermissionMessage::kHosts4OrMoreReadOnly |
| + : PermissionMessage::kHosts4OrMore; |
| - const int kRetainedFilesMessageIDs[6] = { |
| + static const int kNumMessageIDs = 6; |
| + const int kRetainedFilesMessageIDs[kNumMessageIDs] = { |
| IDS_EXTENSION_PROMPT_WARNING_HOSTS_DEFAULT, |
| IDS_EXTENSION_PROMPT_WARNING_HOST_SINGULAR, |
| IDS_EXTENSION_PROMPT_WARNING_HOSTS_ZERO, |
| IDS_EXTENSION_PROMPT_WARNING_HOSTS_TWO, |
| IDS_EXTENSION_PROMPT_WARNING_HOSTS_FEW, |
| - IDS_EXTENSION_PROMPT_WARNING_HOSTS_MANY, }; |
| + IDS_EXTENSION_PROMPT_WARNING_HOSTS_MANY, |
| + }; |
| + const int kReadOnlyRetainedFilesMessageIDs[kNumMessageIDs] = { |
| + IDS_EXTENSION_PROMPT_WARNING_HOSTS_DEFAULT_READ_ONLY, |
| + IDS_EXTENSION_PROMPT_WARNING_HOST_SINGULAR_READ_ONLY, |
| + IDS_EXTENSION_PROMPT_WARNING_HOSTS_ZERO_READ_ONLY, |
| + IDS_EXTENSION_PROMPT_WARNING_HOSTS_TWO_READ_ONLY, |
| + IDS_EXTENSION_PROMPT_WARNING_HOSTS_FEW_READ_ONLY, |
| + IDS_EXTENSION_PROMPT_WARNING_HOSTS_MANY_READ_ONLY, |
| + }; |
| + |
| std::vector<int> message_ids; |
| - for (size_t i = 0; i < arraysize(kRetainedFilesMessageIDs); i++) { |
| - message_ids.push_back(kRetainedFilesMessageIDs[i]); |
| + for (size_t i = 0; i < kNumMessageIDs; i++) { |
| + if (read_only) { |
| + message_ids.push_back(kReadOnlyRetainedFilesMessageIDs[i]); |
| + } else { |
| + message_ids.push_back(kRetainedFilesMessageIDs[i]); |
| + } |
| } |
| message = l10n_util::GetPluralStringFUTF16(message_ids, host_list.size()); |