Removing the * from hosts and adding the words 'all' and 'site'.

extensions/common/permissions/permission_message_util.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/permissions/permission_message_util.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/permission_set.h"
@@ skipping 20 matching lines @@
   if (a == "org")
     return b != "com" && b != "net";
   return false;
 }
 
 }  // namespace
 
 namespace permission_message_util {
 
 PermissionMessage CreateFromHostList(const std::set<std::string>& hosts) {
-  std::vector<std::string> host_list(hosts.begin(), hosts.end());
-  DCHECK(host_list.size());
+  std::vector<base::string16> host_list;
   PermissionMessage::ID message_id;
   base::string16 message;
   base::string16 details;

[not at google - send to devlin, 2014/07/23 01:32:45]

nits: declare these 3 (or 2) variables only when you need them.

[mhm, 2014/07/23 02:38:45]

Done.

+  const uint32_t kMaxBeforeListOfHosts = 3;

[not at google - send to devlin, 2014/07/23 01:32:45]

size_t?

[mhm, 2014/07/23 02:38:45]

Done.

+  typedef std::pair<PermissionMessage::ID, int> MsgPair;
+  int host_msg_id = hosts.size() <= kMaxBeforeListOfHosts
+                        ? IDS_EXTENSION_PROMPT_WARNING_HOST_AND_SUBDOMAIN
+                        : IDS_EXTENSION_PROMPT_WARNING_HOST_AND_SUBDOMAIN_LIST;
+  const MsgPair kMessagesList[kMaxBeforeListOfHosts + 1] = {

[not at google - send to devlin, 2014/07/23 01:32:45]

do you even need to specify a size here? I would have thought you can just go

const MsgPair kMessagesList[] = {
 ...
};

the nice part about that is then you can get rid of kMaxBeforeListOfHosts
entirely and use arraysize(kMessagesList) when needed (very slightly different
logic needed of course).

[mhm, 2014/07/23 02:38:45]

Done.

+      std::make_pair(PermissionMessage::kHosts1,
+                     IDS_EXTENSION_PROMPT_WARNING_1_HOST),
+      std::make_pair(PermissionMessage::kHosts2,
+                     IDS_EXTENSION_PROMPT_WARNING_2_HOSTS),
+      std::make_pair(PermissionMessage::kHosts3,
+                     IDS_EXTENSION_PROMPT_WARNING_3_HOSTS),
+      std::make_pair(PermissionMessage::kHosts4OrMore,
+                     IDS_EXTENSION_PROMPT_WARNING_HOSTS_4_OR_MORE_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]));
-      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]));
-      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]));
-      break;
-    default:
-      message_id = PermissionMessage::kHosts4OrMore;
+  for (std::set<std::string>::const_iterator it = hosts.begin();
+       it != hosts.end();
+       ++it) {
+    std::string host = *it;
+    host_list.push_back(
+        host[0] == '*' && host[1] == '.'
+            ? l10n_util::GetStringFUTF16(host_msg_id,
+                                         base::UTF8ToUTF16(host.erase(0, 2)))
+            : base::UTF8ToUTF16(host));
+  }
+  DCHECK(host_list.size());
 
-      const int kRetainedFilesMessageIDs[6] = {
-          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, };
-      std::vector<int> message_ids;
-      for (size_t i = 0; i < arraysize(kRetainedFilesMessageIDs); i++) {
-        message_ids.push_back(kRetainedFilesMessageIDs[i]);
-      }
-      message = l10n_util::GetPluralStringFUTF16(message_ids, host_list.size());
-
-      for (size_t i = 0; i < host_list.size(); ++i) {
-        if (i > 0)
-          details += base::ASCIIToUTF16("\n");
-        details += l10n_util::GetStringFUTF16(
-            IDS_EXTENSION_PROMPT_WARNING_HOST_LIST_ENTRY,
-            base::UTF8ToUTF16(host_list[i]));
-      }
+  if (host_list.size() <= kMaxBeforeListOfHosts) {

[not at google - send to devlin, 2014/07/23 01:32:45]

this could be a bit simpler if you used a MsgPair rather than unwrapping them
into a message and message_id.

[mhm, 2014/07/23 02:38:45]

Done.

+    message_id = kMessagesList[host_list.size() - 1].first;
+    message = l10n_util::GetStringFUTF16(
+        kMessagesList[host_list.size() - 1].second, host_list, NULL);
+  } else {
+    message_id = kMessagesList[kMaxBeforeListOfHosts].first;
+    message =
+        l10n_util::GetStringUTF16(kMessagesList[kMaxBeforeListOfHosts].second);
+    for (size_t i = 0; i < host_list.size(); ++i) {
+      if (i > 0)
+        details += base::ASCIIToUTF16("\n");
+      details += l10n_util::GetStringFUTF16(
+          IDS_EXTENSION_PROMPT_WARNING_HOST_LIST_ENTRY, host_list[i]);
+    }
   }
 
   return PermissionMessage(message_id, message, details);
 }
 
 std::set<std::string> GetDistinctHosts(const URLPatternSet& host_patterns,
                                        bool include_rcd,
                                        bool exclude_file_scheme) {
   // Use a vector to preserve order (also faster than a map on small sets).
   // Each item is a host split into two parts: host without RCDs and
@@ skipping 42 matching lines @@
   // Build up the final vector by concatenating hosts and RCDs.
   std::set<std::string> distinct_hosts;
   for (HostVector::iterator it = hosts_best_rcd.begin();
        it != hosts_best_rcd.end();
        ++it)
     distinct_hosts.insert(it->first + it->second);
   return distinct_hosts;
 }
 
 }  // namespace permission_message_util