Split out the bookmark permission into its own line in ExtensionInstallUI.

chrome/common/extensions/extension.cc

 // Copyright (c) 2010 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/extension.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 14 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
 #include "webkit/glue/image_decoder.h"
 
 #if defined(OS_WIN)
 #include "base/registry.h"
 #endif
 
 namespace keys = extension_manifest_keys;
 namespace values = extension_manifest_values;
 namespace errors = extension_manifest_errors;
 
@@ skipping 94 matching lines @@
   Extension::kExperimentalPermission,
   Extension::kGeolocationPermission,
   Extension::kHistoryPermission,
   Extension::kNotificationPermission,
   Extension::kTabPermission,
   Extension::kUnlimitedStoragePermission,
 };
 const size_t Extension::kNumPermissions =
     arraysize(Extension::kPermissionNames);
 
+const Extension::SimplePermissions& Extension::GetSimplePermissions() {
+  static SimplePermissions permissions;
+  if (permissions.empty()) {
+    permissions[Extension::kBookmarkPermission] =
+        l10n_util::GetStringUTF16(
+            IDS_EXTENSION_PROMPT2_WARNING_BOOKMARKS);
+    permissions[Extension::kGeolocationPermission] =
+        l10n_util::GetStringUTF16(
+            IDS_EXTENSION_PROMPT2_WARNING_GEOLOCATION);
+  }
+  return permissions;
+}
+
 Extension::~Extension() {
 }
 
 const std::string Extension::VersionString() const {
   return version_->GetString();
 }
 
 // static
 bool Extension::IsExtension(const FilePath& file_name) {
   return file_name.MatchesExtension(
@@ skipping 708 matching lines @@
 
     std::set<std::string> difference;
     std::set_difference(new_hosts.begin(), new_hosts.end(),
                         old_hosts.begin(), old_hosts.end(),
                         std::insert_iterator<std::set<std::string> >(
                             difference, difference.end()));
     if (difference.size() > 0)
       return true;
   }
 
-  // If we're going from not having history to not having it, it's an increase.
   if (!old_extension->HasEffectiveBrowsingHistoryPermission() &&
       new_extension->HasEffectiveBrowsingHistoryPermission()) {
     return true;
   }
 
+  const SimplePermissions& simple_permissions = GetSimplePermissions();
+  for (SimplePermissions::const_iterator iter = simple_permissions.begin();
+       iter != simple_permissions.end(); ++iter) {
+    if (!old_extension->HasApiPermission(iter->first) &&
+        new_extension->HasApiPermission(iter->first)) {
+      return true;
+    }
+  }
+
   // Nothing much has changed.
   return false;
 }
 
 // static
 bool Extension::HasEffectiveBrowsingHistoryPermission() const {
   return HasApiPermission(kTabPermission) ||
       HasApiPermission(kBookmarkPermission);
 }
 
@@ skipping 848 matching lines @@
         } else {
           return false;
         }
       } else {
         return true;
       }
     }
   }
   return false;
 }