chrome/common/net/url_fixer_upper.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: chrome/common/net/url_fixer_upper.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: chrome/common/net/url_fixer_upper.cc

diff --git a/chrome/common/net/url_fixer_upper.cc b/chrome/common/net/url_fixer_upper.cc

index 34966da4b1cc7a581348667db02200e183626e92..e9c2d1360d6bd8a893f1397930d1ccb3a859525c 100644

--- a/chrome/common/net/url_fixer_upper.cc

+++ b/chrome/common/net/url_fixer_upper.cc

@@ -424,7 +424,7 @@ std::string SegmentURLInternal(std::string* text, url::Parsed* parts) {

// Couldn't determine the scheme, so just pick one.

parts->scheme.reset();

scheme = StartsWithASCII(*text, "ftp.", false) ?

- content::kFtpScheme : content::kHttpScheme;

+ content::kFtpScheme : url::kHttpScheme;

}

« no previous file with comments | « chrome/common/content_settings_pattern.cc ('k') | chrome/common/search_urls.cc » ('j') | no next file with comments »