chrome/common/net/url_fixer_upper.cc - Issue 328713006: Merge 275988 "Move about://-related constants from //content to ..."

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 328713006: Merge 275988 "Move about://-related constants from //content to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2042/src/

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

« no previous file with comments | « chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/net/url_fixer_upper.cc

===================================================================

--- chrome/common/net/url_fixer_upper.cc (revision 276109)

+++ chrome/common/net/url_fixer_upper.cc (working copy)

@@ -429,12 +429,11 @@

}

// Proceed with about and chrome schemes, but not file or nonstandard schemes.

- if ((scheme != content::kAboutScheme) &&

- (scheme != content::kChromeUIScheme) &&

+ if ((scheme != url::kAboutScheme) && (scheme != content::kChromeUIScheme) &&

((scheme == url::kFileScheme) ||

- !url::IsStandard(scheme.c_str(),

- url::Component(0,

- static_cast<int>(scheme.length()))))) {

+ !url::IsStandard(

+ scheme.c_str(),

+ url::Component(0, static_cast<int>(scheme.length()))))) {

return scheme;

}

@@ -535,9 +534,9 @@

}

// Parse and rebuild about: and chrome: URLs, except about:blank.

- bool chrome_url = !LowerCaseEqualsASCII(trimmed, content::kAboutBlankURL) &&

- ((scheme == content::kAboutScheme) ||

- (scheme == content::kChromeUIScheme));

+ bool chrome_url =

+ !LowerCaseEqualsASCII(trimmed, url::kAboutBlankURL) &&

+ ((scheme == url::kAboutScheme) || (scheme == content::kChromeUIScheme));

// For some schemes whose layouts we understand, we rebuild it.

if (chrome_url ||