Allow extensions to remove and override the bookmark shortcut key

chrome/common/extensions/manifest_handlers/settings_overrides_handler.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/manifest_handlers/settings_overrides_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 202 matching lines @@
 SettingsOverrides::SettingsOverrides() {}
 
 SettingsOverrides::~SettingsOverrides() {}
 
 const SettingsOverrides* SettingsOverrides::Get(
     const Extension* extension) {
   return static_cast<SettingsOverrides*>(
       extension->GetManifestData(manifest_keys::kSettingsOverride));
 }
 
-bool SettingsOverrides::RemovesBookmarkButton() const {
-  return bookmarks_ui && bookmarks_ui->remove_button &&
-      *bookmarks_ui->remove_button;
+bool SettingsOverrides::RemovesBookmarkButton(
+    const SettingsOverrides& settings_overrides) {
+  return settings_overrides.bookmarks_ui &&
+      settings_overrides.bookmarks_ui->remove_button &&
+      *settings_overrides.bookmarks_ui->remove_button;
+}
+
+bool SettingsOverrides::RemovesBookmarkShortcut(
+    const SettingsOverrides& settings_overrides) {
+  return settings_overrides.bookmarks_ui &&
+      settings_overrides.bookmarks_ui->remove_bookmark_shortcut &&
+      *settings_overrides.bookmarks_ui->remove_bookmark_shortcut;
 }
 
 SettingsOverridesHandler::SettingsOverridesHandler() {}
 
 SettingsOverridesHandler::~SettingsOverridesHandler() {}
 
 bool SettingsOverridesHandler::Parse(Extension* extension,
                                      base::string16* error) {
   const base::Value* dict = NULL;
   CHECK(extension->manifest()->Get(manifest_keys::kSettingsOverride, &dict));
@@ skipping 14 matching lines @@
   info->homepage = ParseHomepage(*settings, error);
   info->search_engine = ParseSearchEngine(settings.get(), error);
   info->startup_pages = ParseStartupPage(*settings, error);
   if (!info->bookmarks_ui && !info->homepage &&
       !info->search_engine && info->startup_pages.empty()) {
     *error =
         base::ASCIIToUTF16(manifest_errors::kInvalidEmptySettingsOverrides);
     return false;
   }
   info->manifest_permission.reset(new ManifestPermissionImpl(
-      info->RemovesBookmarkButton()));
+      SettingsOverrides::RemovesBookmarkButton(*info)));
 
   APIPermissionSet* permission_set =
       PermissionsData::GetInitialAPIPermissions(extension);
   DCHECK(permission_set);
   if (info->search_engine) {
     permission_set->insert(new SettingsOverrideAPIPermission(
         PermissionsInfo::GetInstance()->GetByID(APIPermission::kSearchProvider),
         RemoveWwwPrefix(CreateManifestURL(info->search_engine->search_url)->
             GetOrigin().host())));
   }
@@ skipping 48 matching lines @@
   const SettingsOverrides* data = SettingsOverrides::Get(extension);
   if (data)
     return data->manifest_permission->Clone();
   return NULL;
 }
 const std::vector<std::string> SettingsOverridesHandler::Keys() const {
   return SingleKey(manifest_keys::kSettingsOverride);
 }
 
 }  // namespace extensions