Add a separate warning message for topSites permission.

chrome/common/extensions/permissions/chrome_permission_message_provider.cc

 // Copyright 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/chrome_permission_message_provider.h"
 
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/extensions_client.h"
@@ skipping 63 matching lines @@
 
 ChromePermissionMessageProvider::ChromePermissionMessageProvider() {
 }
 
 ChromePermissionMessageProvider::~ChromePermissionMessageProvider() {
 }
 
 PermissionMessages ChromePermissionMessageProvider::GetPermissionMessages(
     const PermissionSet* permissions,
     Manifest::Type extension_type) const {
+  PermissionMessages messages;
+  if (permissions->HasEffectiveFullAccess()) {
+    messages.push_back(PermissionMessage(
+        PermissionMessage::kFullAccess,
+        l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS)));
+    return messages;
+  }
+
   // Some warnings are more generic and/or powerful and superseed other
   // warnings. In that case, the first message suppresses the second one.
   std::multimap<PermissionMessage::ID, PermissionMessage::ID> kSuppressList;
   kSuppressList.insert(
       {PermissionMessage::kBluetooth, PermissionMessage::kBluetoothDevices});
   kSuppressList.insert(
       {PermissionMessage::kBookmarks, PermissionMessage::kOverrideBookmarksUI});
   // History already allows reading favicons.
   kSuppressList.insert(
       {PermissionMessage::kBrowsingHistory, PermissionMessage::kFavicon});
   // History already allows tabs access.
   kSuppressList.insert(
       {PermissionMessage::kBrowsingHistory, PermissionMessage::kTabs});
+  // History already allows access the list of most frequently visited sites.
+  kSuppressList.insert(
+      {PermissionMessage::kBrowsingHistory, PermissionMessage::kTopSites});
   // A special hack: If kFileSystemWriteDirectory would be displayed, hide
   // kFileSystemDirectory as the write directory message implies it.
   // TODO(sammc): Remove this. See http://crbug.com/284849.
   kSuppressList.insert({PermissionMessage::kFileSystemWriteDirectory,
                         PermissionMessage::kFileSystemDirectory});
   // Full access already allows DeclarativeWebRequest.
   kSuppressList.insert({PermissionMessage::kHostsAll,
                         PermissionMessage::kDeclarativeWebRequest});
+  // Full access implies reading the list of most frequently visited sites.
+  kSuppressList.insert(
+      {PermissionMessage::kHostsAll, PermissionMessage::kTopSites});
   // Full access already covers tabs access.
   kSuppressList.insert(
       {PermissionMessage::kHostsAll, PermissionMessage::kTabs});
   // Tabs already allows reading favicons.
   kSuppressList.insert({PermissionMessage::kTabs, PermissionMessage::kFavicon});
-
-  PermissionMessages messages;
-
-  if (permissions->HasEffectiveFullAccess()) {
-    messages.push_back(PermissionMessage(
-        PermissionMessage::kFullAccess,
-        l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS)));
-    return messages;
-  }
+  // Tabs already allows reading the list of most frequently visited sites.
+  kSuppressList.insert(
+      {PermissionMessage::kTabs, PermissionMessage::kTopSites});
 
   PermissionMsgSet host_msgs =
       GetHostPermissionMessages(permissions, extension_type);
   PermissionMsgSet api_msgs = GetAPIPermissionMessages(permissions);
   PermissionMsgSet manifest_permission_msgs =
       GetManifestPermissionMessages(permissions);
   messages.insert(messages.end(), host_msgs.begin(), host_msgs.end());
   messages.insert(messages.end(), api_msgs.begin(), api_msgs.end());
   messages.insert(messages.end(), manifest_permission_msgs.begin(),
                   manifest_permission_msgs.end());
@@ skipping 321 matching lines @@
   std::set<std::string> old_hosts_set(
       permission_message_util::GetDistinctHosts(old_list, false, false));
   std::set<std::string> new_hosts_only =
       base::STLSetDifference<std::set<std::string> >(new_hosts_set,
                                                      old_hosts_set);
 
   return !new_hosts_only.empty();
 }
 
 }  // namespace extensions