extensions/renderer/dispatcher.cc - Issue 254763005: Move some content url constants to /url.

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: extensions/renderer/dispatcher.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve a merge conflict. Created 6 years, 7 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: extensions/renderer/dispatcher.cc

diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc

index 75b2e43918e906c3fb2616d0e13a0ec8fe80576d..107c2278d39c20c6517ff1237093d8226e4002a2 100644

--- a/extensions/renderer/dispatcher.cc

+++ b/extensions/renderer/dispatcher.cc

@@ -794,8 +794,11 @@ void Dispatcher::UpdateOriginPermissions(

for (URLPatternSet::const_iterator i = origins.begin(); i != origins.end();

++i) {

const char* schemes[] = {

- content::kHttpScheme, content::kHttpsScheme, content::kFileScheme,

- content::kChromeUIScheme, content::kFtpScheme,

+ url::kHttpScheme,

+ url::kHttpsScheme,

+ content::kFileScheme,

+ content::kChromeUIScheme,

+ content::kFtpScheme,

};

for (size_t j = 0; j < arraysize(schemes); ++j) {

if (i->MatchesScheme(schemes[j])) {

« no previous file with comments | « extensions/common/url_pattern.cc ('k') | url/BUILD.gn » ('j') | no next file with comments »