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

chrome/common/extensions/permissions/permission_set.cc

Index: chrome/common/extensions/permissions/permission_set.cc
diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc
index d11162c69a5f206a4193bce6a38e984be229ed45..1014adc2354326e27da20a3e59cf70dbc362e72b 100644
--- a/chrome/common/extensions/permissions/permission_set.cc
+++ b/chrome/common/extensions/permissions/permission_set.cc
@@ -261,7 +261,8 @@ PermissionMessages PermissionSet::GetPermissionMessages(
   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;
   }
 
@@ -308,6 +309,18 @@ std::vector<string16> PermissionSet::GetWarningMessages(
   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()))
@@ -550,7 +563,8 @@ std::set<PermissionMessage> PermissionSet::GetHostPermissionMessages(
   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_);