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 24 matching lines @@
 
 }  // 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());
   PermissionMessage::ID message_id;
   base::string16 message;
+  std::vector<base::string16> khosts;

[not at google - send to devlin, 2014/07/21 23:41:08]

why is this "khosts"? it seems like you can just change host_list to be a
std::vector<string16> and iterate over |hosts| on line 48.

   base::string16 details;
 
-  switch (host_list.size()) {
+  for (size_t i = 0; i < host_list.size(); ++i) {
+    khosts.push_back(host_list[i][0] == '*' && host_list[i][1] == '.'

[not at google - send to devlin, 2014/07/21 23:41:08]

does this behavioral change really not trigger any test failures?

[mhm, 2014/07/21 23:50:53]

I haven't run the tests yet. I will do so as soon as we pass the iterations of
change.

+                         ? l10n_util::GetStringFUTF16(
+                               IDS_EXTENSION_PROMPT_WARNING_HOST_AND_SUBDOMAIN,
+                               base::UTF8ToUTF16(host_list[i].erase(0, 2)))
+                         : base::UTF8ToUTF16(host_list[i]));
+  }
+
+  switch (khosts.size()) {
     case 1:
       message_id = PermissionMessage::kHosts1;
       message = l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT_WARNING_1_HOST,
-                                           base::UTF8ToUTF16(host_list[0]));
+                                           khosts[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 = l10n_util::GetStringFUTF16(
+          IDS_EXTENSION_PROMPT_WARNING_2_HOSTS, khosts[0], khosts[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]));
+                                           khosts[0],
+                                           khosts[1],
+                                           khosts[2]);
       break;
     default:
       message_id = PermissionMessage::kHosts4OrMore;
 
       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());

[not at google - send to devlin, 2014/07/21 23:43:52]

in your screenshot it says "read and modify your data on 4 websites", but then
it's followed by "all google.com sites". that looks kinda wrong, but I can't
think of how to improve it other than saying "many sites" instead of the actual
number.

[mhm, 2014/07/21 23:50:53]

I see your point. I will go ahead and change it to "many sites".

 
-      for (size_t i = 0; i < host_list.size(); ++i) {
+      for (size_t i = 0; i < khosts.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]));
+            IDS_EXTENSION_PROMPT_WARNING_HOST_LIST_ENTRY, khosts[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).
@@ skipping 43 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