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..a80891a523b4e71a827720c124fd52a83a96bfa3 100644
--- a/chrome/common/extensions/permissions/permission_set.cc
+++ b/chrome/common/extensions/permissions/permission_set.cc
@@ -255,7 +255,7 @@ std::set<std::string>
 }
 
 PermissionMessages PermissionSet::GetPermissionMessages(
-    Manifest::Type extension_type) const {
+    Manifest::Type extension_type, bool details_only) const {
   PermissionMessages messages;
 
   if (HasEffectiveFullAccess()) {
@@ -266,7 +266,7 @@ PermissionMessages PermissionSet::GetPermissionMessages(
   }
 
   std::set<PermissionMessage> host_msgs =
-      GetHostPermissionMessages(extension_type);
+      GetHostPermissionMessages(extension_type, details_only);
   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());
@@ -275,9 +275,10 @@ PermissionMessages PermissionSet::GetPermissionMessages(
 }
 
 std::vector<string16> PermissionSet::GetWarningMessages(
-    Manifest::Type extension_type) const {
+    Manifest::Type extension_type, bool details_only) const {
   std::vector<string16> messages;
-  PermissionMessages permissions = GetPermissionMessages(extension_type);
+  PermissionMessages permissions =
+      GetPermissionMessages(extension_type, details_only);
 
   bool audio_capture = false;
   bool video_capture = false;
@@ -538,7 +539,7 @@ std::set<PermissionMessage> PermissionSet::GetAPIPermissionMessages() const {
 }
 
 std::set<PermissionMessage> PermissionSet::GetHostPermissionMessages(
-    Manifest::Type extension_type) const {
+    Manifest::Type extension_type, bool details_only) const {
   // Since platform apps always use isolated storage, they can't (silently)
   // access user data on other domains, so there's no need to prompt.
   // Note: this must remain consistent with HasLessHostPrivilegesThan.
@@ -558,8 +559,10 @@ std::set<PermissionMessage> PermissionSet::GetHostPermissionMessages(
       messages.insert(additional_warnings[i]);
 
     std::set<std::string> hosts = GetDistinctHostsForDisplay();
-    if (!hosts.empty())
-      messages.insert(PermissionMessage::CreateFromHostList(hosts));
+    if (!hosts.empty()) {
+      messages.insert(
+          PermissionMessage::CreateFromHostList(hosts, details_only));
+    }
   }
   return messages;
 }