Generalize "hide bookmark star" permission to "override bookmarks UI"

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 "chrome/common/extensions/permissions/permission_message_util.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/url_pattern_set.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
+namespace {
+
+PermissionMessages::iterator FindMessageByID(PermissionMessages& messages,
+                                             int id) {
+  for (PermissionMessages::iterator it = messages.begin();
+       it != messages.end(); ++it) {
+    if (it->id() == id)
+      return it;
+  }
+
+  return messages.end();
+}
+
+}  // namespace
+
 ChromePermissionMessageProvider::ChromePermissionMessageProvider() {
 }
 
 ChromePermissionMessageProvider::~ChromePermissionMessageProvider() {
 }
 
 // static
 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;
   }
 
   std::set<PermissionMessage> host_msgs =
       GetHostPermissionMessages(permissions, extension_type);
   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 =
+      FindMessageByID(messages, PermissionMessage::kOverrideBookmarksUI);
+  if (override_bookmarks_ui != messages.end() &&
+      FindMessageByID(messages, PermissionMessage::kBookmarks) !=
+          messages.end()) {
+    messages.erase(override_bookmarks_ui);
+  }
+
   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 266 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