chrome/common/extensions/manifest_url_handler.cc - Issue 24891002: Initial WebUI extension for enhanced bookmarks

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_url_handler.cc

Issue 24891002: Initial WebUI extension for enhanced bookmarks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 3 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:

Index: chrome/common/extensions/manifest_url_handler.cc

diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc

index d05ee1333c40f7b8c578215ca40c9d6cb27deac5..14e01898d5b96c35794b5499a1a08144a023752d 100644

--- a/chrome/common/extensions/manifest_url_handler.cc

+++ b/chrome/common/extensions/manifest_url_handler.cc

@@ -289,6 +289,11 @@ bool URLOverridesHandler::Parse(Extension* extension, string16* error) {

#if defined(OS_CHROMEOS)

is_override = (is_override && page != keyboard::kKeyboardWebUIHost);

#endif

+#if defined(ENABLE_ENHANCED_BOOKMARKS)

+ is_override = (is_override &&

+ !(extension->location() == Manifest::COMPONENT &&

+ page == chrome::kChromeUIEnhancedBookmarksHost));

+#endif

if (is_override || !iter.value().GetAsString(&val)) {

*error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);