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 62 matching lines @@
 
 ChromePermissionMessageProvider::ChromePermissionMessageProvider() {
 }
 
 ChromePermissionMessageProvider::~ChromePermissionMessageProvider() {
 }
 
 PermissionMessages ChromePermissionMessageProvider::GetPermissionMessages(
     const PermissionSet* permissions,
     Manifest::Type extension_type) const {
+  PermissionMessages messages;
+  if (permissions->HasEffectiveFullAccess()) {

[not at google - send to devlin, 2014/08/18 22:59:42]

Why did you need to move this up?

[meacer, 2014/08/18 23:11:07]

Early return. The suppress list isn't needed if we already have full access.

[not at google - send to devlin, 2014/08/18 23:17:30]

Ah right. Full as in ***FULL*** not like all-urls. Got it.

aside:

Seems like this is only "plugin" - but I thought automation.desktop was also
going to have that, given it can drive your whole desktop? That means that this
GetPermissionMessages method is too primitive for the general case. You'd need
to wire that into the automation manifest handling somehow.

[meacer, 2014/08/18 23:31:13]

That looks like a bug to me with the automation API message generation? If I
have "automation" and all sites, I get two warnings for full access and
all-urls.

+    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