chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc - Issue 183883033: Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 183883033: Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: formatting fixes Created 6 years, 9 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

« chrome/common/extensions/docs/templates/json/manifest.json ('K') | « chrome/common/extensions/docs/templates/public/extensions/ui_override.html ('k') | chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 df76be8220d0772b350863af259a207b4b07e0ca..255ab718e78c389a19531ba57f007112217eba52 100644

--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

@@ -261,8 +261,9 @@ bool SettingsOverridesHandler::Parse(Extension* extension,

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);

+ *error = ErrorUtils::FormatErrorMessageUTF16(

+ manifest_errors::kInvalidEmptyDictionary,

+ manifest_keys::kSettingsOverride);

return false;

}

info->manifest_permission.reset(new ManifestPermissionImpl(