Show read-only messages for non-interact non-desktop Automation extensions

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) {
+  return CreateFromHostList(hosts, false);
+}
+
+PermissionMessage CreateFromHostList(const std::set<std::string>& hosts,
+                                     bool read_only) {
   typedef std::pair<PermissionMessage::ID, int> MsgPair;
-  const MsgPair kMessagesList[] = {
+  static const int kNumMessages = 4;

[not at google - send to devlin, 2014/07/25 18:17:42]

we went to great lengths to avoid hard-coding a number here.

could you:
- remove it,
- do COMPILE_ASSERT(arraysize(kReadWriteMessagesList) ==
arraysize(kReadOnlyMessagesList)
- (the part I'm unsure about) make messages_list a pointer not an array
- either continue to use arraysize(kMessagesList) or assign it to a value like
messages_list_size.

[aboxhall, 2014/07/25 19:06:31]

Done.
Done.
It's not an array, it's a reference.
Done (but it's assigned to a static const value).

+  static const MsgPair kMessagesList[kNumMessages] = {
       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_LIST)};
+  static const MsgPair kReadOnlyMessagesList[kNumMessages] = {
+      std::make_pair(PermissionMessage::kHosts1ReadOnly,
+                     IDS_EXTENSION_PROMPT_WARNING_1_HOST_READ_ONLY),
+      std::make_pair(PermissionMessage::kHosts2ReadOnly,
+                     IDS_EXTENSION_PROMPT_WARNING_2_HOSTS_READ_ONLY),
+      std::make_pair(PermissionMessage::kHosts3ReadOnly,
+                     IDS_EXTENSION_PROMPT_WARNING_3_HOSTS_READ_ONLY),
+      std::make_pair(PermissionMessage::kHosts4OrMoreReadOnly,
+                     IDS_EXTENSION_PROMPT_WARNING_HOSTS_LIST_READ_ONLY)};
+  const MsgPair (&messages_list)[kNumMessages] =
+      read_only ? kReadOnlyMessagesList : kMessagesList;
 
-  int host_msg_id = hosts.size() < arraysize(kMessagesList)
+  int host_msg_id = hosts.size() < kNumMessages

[meacer, 2014/07/25 18:13:10]

nit: This style seems to be more common:

bool ?
true :
false;
 

[aboxhall, 2014/07/25 19:06:31]

Funny: this is how clang-format formats it. I'm going to leave as-is for that
reason.

                         ? IDS_EXTENSION_PROMPT_WARNING_HOST_AND_SUBDOMAIN
                         : IDS_EXTENSION_PROMPT_WARNING_HOST_AND_SUBDOMAIN_LIST;
   std::vector<base::string16> host_list;
   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());
 
-  if (host_list.size() < arraysize(kMessagesList)) {
+  if (host_list.size() < kNumMessages) {
     return PermissionMessage(
-        kMessagesList[host_list.size() - 1].first,
+        messages_list[host_list.size() - 1].first,
         l10n_util::GetStringFUTF16(
-            kMessagesList[host_list.size() - 1].second, host_list, NULL));
+            messages_list[host_list.size() - 1].second, host_list, NULL));
   }
 
   base::string16 details;
   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(
-      kMessagesList[arraysize(kMessagesList) - 1].first,
+      messages_list[arraysize(kMessagesList) - 1].first,
       l10n_util::GetStringUTF16(
-          kMessagesList[arraysize(kMessagesList) - 1].second),
+          messages_list[arraysize(kMessagesList) - 1].second),
       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
   // current best RCD.
   typedef std::vector<std::pair<std::string, std::string> > HostVector;
@@ skipping 40 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