Suppress tabs permission warning if there is already a browsingHistory warning.

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 "extensions/common/extensions_client.h"
 #include "extensions/common/permissions/permission_message.h"
@@ skipping 55 matching lines @@
                                              int id) {
   for (PermissionMessages::iterator it = messages.begin();
        it != messages.end(); ++it) {
     if (it->id() == id)
       return it;
   }
 
   return messages.end();
 }
 
+void SuppressMessage(PermissionMessages& messages,
+                     int suppressing_message,
+                     int suppressed_message) {
+  // If there is a warning for browsing history, don't show the warning for tabs
+  // permission because the texts are very similar.
+  PermissionMessages::iterator suppressed =
+      FindMessageByID(messages, suppressed_message);
+  if (suppressed != messages.end() &&
+      FindMessageByID(messages, suppressing_message) != messages.end()) {
+    messages.erase(suppressed);
+  }
+}
+
 }  // namespace
 
 ChromePermissionMessageProvider::ChromePermissionMessageProvider() {
 }
 
 ChromePermissionMessageProvider::~ChromePermissionMessageProvider() {
 }
 
 // static
 PermissionMessages ChromePermissionMessageProvider::GetPermissionMessages(
@@ skipping 13 matching lines @@
   std::set<PermissionMessage> api_msgs = GetAPIPermissionMessages(permissions);
   std::set<PermissionMessage> 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());
 
   // Special hack: bookmarks permission message supersedes override bookmarks UI
   // permission message if both permissions are specified.
   PermissionMessages::iterator override_bookmarks_ui =

[Devlin, 2014/04/11 23:18:56]

This code can be deleted now, yes? (It looks like it's doing the same thing as
the call on line 130.)

[Devlin, 2014/04/11 23:19:58]

Oh, looks like you caught this one while I was reviewing. Nevermind.

       FindMessageByID(messages, PermissionMessage::kOverrideBookmarksUI);
   if (override_bookmarks_ui != messages.end() &&
       FindMessageByID(messages, PermissionMessage::kBookmarks) !=
           messages.end()) {
     messages.erase(override_bookmarks_ui);
   }
 
+  SuppressMessage(messages,
+                  PermissionMessage::kBookmarks,
+                  PermissionMessage::kOverrideBookmarksUI);
+  SuppressMessage(messages,
+                  PermissionMessage::kBrowsingHistory,

[Devlin, 2014/04/11 23:18:56]

I think I'd rather have BrowsingHistory suppressed.  I think "Access your tabs
and browsing activity" is scarier than "Read and modify your browsing history",
and we should always show the scariest. :)

[meacer, 2014/04/11 23:49:53]

I actually think the scary one is browsing history because it encapsulates
current browsing activity. "History" is also more familiar to users than
"activity", so I'd like to keep the word history.

+                  PermissionMessage::kTabs);
   return messages;
 }
 
 // static
 std::vector<base::string16> ChromePermissionMessageProvider::GetWarningMessages(
     const PermissionSet* permissions,
     Manifest::Type extension_type) const {
   std::vector<base::string16> message_strings;
   PermissionMessages messages =
       GetPermissionMessages(permissions, extension_type);
@@ skipping 111 matching lines @@
     if (permission_it->HasMessages()) {
       PermissionMessages new_messages = permission_it->GetMessages();
       messages.insert(new_messages.begin(), new_messages.end());
     }
   }
 
   // A special hack: If kFileSystemWriteDirectory would be displayed, hide
   // kFileSystemDirectory and and kFileSystemWrite as the write directory
   // message implies the other two.
   // TODO(sammc): Remove this. See http://crbug.com/284849.
   std::set<PermissionMessage>::iterator write_directory_message =

[Devlin, 2014/04/11 23:18:56]

More similar hacks that could use your function.

       messages.find(PermissionMessage(
           PermissionMessage::kFileSystemWriteDirectory, base::string16()));
   if (write_directory_message != messages.end()) {
     messages.erase(
         PermissionMessage(PermissionMessage::kFileSystemWrite,
                           base::string16()));
     messages.erase(
         PermissionMessage(PermissionMessage::kFileSystemDirectory,
                           base::string16()));
   }
@@ skipping 134 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