Making the extension permissions dialog scrollable, when needed (adding expandable sections for thi…

chrome/common/extensions/permissions/permission_set.cc

 // Copyright (c) 2013 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 "chrome/common/extensions/permissions/permission_set.h"
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 
@@ skipping 243 matching lines @@
   return GetDistinctHosts(hosts_displayed_as_url, true, true);
 }
 
 PermissionMessages PermissionSet::GetPermissionMessages(
     Manifest::Type extension_type) const {
   PermissionMessages messages;
 
   if (HasEffectiveFullAccess()) {
     messages.push_back(PermissionMessage(
         PermissionMessage::kFullAccess,
-        l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS)));
+        l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS),
+        string16()));
     return messages;
   }
 
   std::set<PermissionMessage> host_msgs =
       GetHostPermissionMessages(extension_type);
   std::set<PermissionMessage> api_msgs = GetAPIPermissionMessages();
   messages.insert(messages.end(), host_msgs.begin(), host_msgs.end());
   messages.insert(messages.end(), api_msgs.begin(), api_msgs.end());
 
   return messages;
@@ skipping 26 matching lines @@
         continue;
       }
     }
 
     messages.push_back(i->message());
   }
 
   return messages;
 }
 
+std::vector<string16> PermissionSet::GetWarningMessagesDetails(
+    Manifest::Type extension_type) const {
+  std::vector<string16> messages;
+  PermissionMessages permissions = GetPermissionMessages(extension_type);
+
+  for (PermissionMessages::const_iterator i = permissions.begin();
+       i != permissions.end(); ++i)
+    messages.push_back(i->details());
+
+  return messages;
+}
+
 bool PermissionSet::IsEmpty() const {
   // Not default if any host permissions are present.
   if (!(explicit_hosts().is_empty() && scriptable_hosts().is_empty()))
     return false;
 
   // Or if it has no api permissions.
   return apis().empty();
 }
 
 bool PermissionSet::HasAPIPermission(
@@ skipping 222 matching lines @@
   // access user data on other domains, so there's no need to prompt.
   // Note: this must remain consistent with HasLessHostPrivilegesThan.
   // See crbug.com/255229.
   std::set<PermissionMessage> messages;
   if (extension_type == Manifest::TYPE_PLATFORM_APP)
     return messages;
 
   if (HasEffectiveAccessToAllHosts()) {
     messages.insert(PermissionMessage(
         PermissionMessage::kHostsAll,
-        l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS)));
+        l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS),
+        string16()));
   } else {
     PermissionMessages additional_warnings =
         GetChromeSchemePermissionWarnings(effective_hosts_);
     for (size_t i = 0; i < additional_warnings.size(); ++i)
       messages.insert(additional_warnings[i]);
 
     std::set<std::string> hosts = GetDistinctHostsForDisplay();
     if (!hosts.empty())
       messages.insert(PermissionMessage::CreateFromHostList(hosts));
   }
@@ skipping 46 matching lines @@
   std::set<std::string> new_hosts_only;
 
   std::set_difference(new_hosts_set.begin(), new_hosts_set.end(),
                       old_hosts_set.begin(), old_hosts_set.end(),
                       std::inserter(new_hosts_only, new_hosts_only.begin()));
 
   return !new_hosts_only.empty();
 }
 
 }  // namespace extensions