Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

Issue 143493005: Allow extensions to remove and override the bookmark shortcut key (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update mac test fix Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
index 0233edbd18e6a9338906faa0e8ac0670dd17f88d..df76be8220d0772b350863af259a207b4b07e0ca 100644
--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
@@ -220,9 +220,18 @@ const SettingsOverrides* SettingsOverrides::Get(
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() {}
@@ -257,7 +266,7 @@ bool SettingsOverridesHandler::Parse(Extension* extension,
return false;
}
info->manifest_permission.reset(new ManifestPermissionImpl(
- info->RemovesBookmarkButton()));
+ SettingsOverrides::RemovesBookmarkButton(*info)));
APIPermissionSet* permission_set =
PermissionsData::GetInitialAPIPermissions(extension);

Powered by Google App Engine
This is Rietveld 408576698