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 237 matching lines @@
   for (URLPatternSet::const_iterator i = effective_hosts_.begin();
        i != effective_hosts_.end(); ++i) {
     if (i->scheme() != chrome::kChromeUIScheme) {
       hosts_displayed_as_url.AddPattern(*i);
     }
   }
   return GetDistinctHosts(hosts_displayed_as_url, true, true);
 }
 
 PermissionMessages PermissionSet::GetPermissionMessages(
-    Manifest::Type extension_type) const {
+    Manifest::Type extension_type, bool details_only) const {
   PermissionMessages messages;
 
   if (HasEffectiveFullAccess()) {
     messages.push_back(PermissionMessage(
         PermissionMessage::kFullAccess,
         l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS)));
     return messages;
   }
 
   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());
 
   return messages;
 }
 
 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;
   for (PermissionMessages::const_iterator i = permissions.begin();
        i != permissions.end(); ++i) {
     if (i->id() == PermissionMessage::kAudioCapture)
       audio_capture = true;
     if (i->id() == PermissionMessage::kVideoCapture)
       video_capture = true;
   }
@@ skipping 240 matching lines @@
               PermissionMessage::kUnknown);
     if (permission_it->HasMessages()) {
       PermissionMessages new_messages = permission_it->GetMessages();
       messages.insert(new_messages.begin(), new_messages.end());
     }
   }
   return messages;
 }
 
 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.
   // 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)));
   } 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));
+    if (!hosts.empty()) {
+      messages.insert(
+          PermissionMessage::CreateFromHostList(hosts, details_only));
+    }
   }
   return messages;
 }
 
 bool PermissionSet::HasLessAPIPrivilegesThan(
     const PermissionSet* permissions) const {
   if (permissions == NULL)
     return false;
 
   std::set<PermissionMessage> current_warnings =
@@ skipping 37 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