Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4401)

Unified Diff: chrome/common/net/url_fixer_upper.cc

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android ifx 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
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 d5016cd6e1ac800fbe31eb4a4cc6a4886f978f33..8d330fad711bc21d4077090a4250d73d6f212af5 100644
--- a/chrome/common/net/url_fixer_upper.cc
+++ b/chrome/common/net/url_fixer_upper.cc
@@ -429,12 +429,11 @@ std::string SegmentURLInternal(std::string* text, url::Parsed* parts) {
}
// 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 @@ GURL URLFixerUpper::FixupURL(const std::string& text,
}
// 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 ||
« 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 »

Powered by Google App Engine
This is Rietveld 408576698