chrome/browser/extensions/extension_prefs.cc - Issue 12792005: Allow extensions on chrome:// URLs, when flag is set and permission is explicitly requested

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/browser/extensions/extension_prefs.cc

Issue 12792005: Allow extensions on chrome:// URLs, when flag is set and permission is explicitly requested (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reinstate original pickle order; add scripts clause to content_script_chrome_url_invalid.json to av… Created 7 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

Index: chrome/browser/extensions/extension_prefs.cc

diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc

index 02b405e56264fe915ddce2addf416f70790d0211..76950c9cfe1a9c52ebd37f8a72b5a770717e2aa6 100644

--- a/chrome/browser/extensions/extension_prefs.cc

+++ b/chrome/browser/extensions/extension_prefs.cc

@@ -558,7 +558,7 @@ PermissionSet* ExtensionPrefs::ReadExtensionPrefPermissionSet(

URLPatternSet scriptable_hosts;

ReadExtensionPrefURLPatternSet(

extension_id, JoinPrefs(pref_key, kPrefScriptableHosts),

- &scriptable_hosts, UserScript::kValidUserScriptSchemes);

+ &scriptable_hosts, UserScript::ValidUserScriptSchemes());

return new PermissionSet(apis, explicit_hosts, scriptable_hosts);

}

« no previous file with comments | « chrome/browser/extensions/crx_installer.cc ('k') | chrome/browser/extensions/user_script_master.cc » ('j') | no next file with comments »