summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc5
-rw-r--r--chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc5
-rw-r--r--extensions/common/manifest_constants.cc2
3 files changed, 7 insertions, 5 deletions
diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
index 072bdec..9f3855d 100644
--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
@@ -306,8 +306,9 @@ bool SettingsOverridesHandler::Validate(
if (!FeatureSwitch::enable_override_bookmarks_ui()->IsEnabled()) {
warnings->push_back(InstallWarning(
ErrorUtils::FormatErrorMessage(
- manifest_errors::kUnrecognizedManifestKey,
- manifest_keys::kBookmarkUI)));
+ manifest_errors::kUnrecognizedManifestProperty,
+ manifest_keys::kBookmarkUI,
+ manifest_keys::kSettingsOverride)));
} else if (settings_overrides->bookmarks_ui->hide_bookmark_button) {
warnings->push_back(InstallWarning(
ErrorUtils::FormatErrorMessage(
diff --git a/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc
index 095fe4a..4ac3524 100644
--- a/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc
+++ b/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc
@@ -187,8 +187,9 @@ bool UIOverridesHandler::Validate(const Extension* extension,
if (!FeatureSwitch::enable_override_bookmarks_ui()->IsEnabled()) {
warnings->push_back(InstallWarning(
ErrorUtils::FormatErrorMessage(
- manifest_errors::kUnrecognizedManifestKey,
- manifest_keys::kBookmarkUI)));
+ manifest_errors::kUnrecognizedManifestProperty,
+ manifest_keys::kBookmarkUI,
+ manifest_keys::kUIOverride)));
}
}
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc
index 4b6017b..40e0f9e 100644
--- a/extensions/common/manifest_constants.cc
+++ b/extensions/common/manifest_constants.cc
@@ -17,7 +17,7 @@ const char kBackgroundPageLegacy[] = "background_page";
const char kBackgroundPersistent[] = "background.persistent";
const char kBackgroundScripts[] = "background.scripts";
const char kBluetooth[] = "bluetooth";
-const char kBookmarkUI[] = "chrome_ui_overrides.bookmarks_ui";
+const char kBookmarkUI[] = "bookmarks_ui";
const char kBrowserAction[] = "browser_action";
const char kChromeURLOverrides[] = "chrome_url_overrides";
const char kCommands[] = "commands";