diff options
Diffstat (limited to 'chromium/components/url_formatter/url_fixer.cc')
| -rw-r--r-- | chromium/components/url_formatter/url_fixer.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chromium/components/url_formatter/url_fixer.cc b/chromium/components/url_formatter/url_fixer.cc index 26be3c86492..c39bd737e52 100644 --- a/chromium/components/url_formatter/url_fixer.cc +++ b/chromium/components/url_formatter/url_fixer.cc @@ -551,10 +551,16 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) { return GURL(); } - // Parse and rebuild about: and chrome: URLs, except about:blank. + // 'about:blank' is special-cased in various places in the code so it + // shouldn't be transformed into 'chrome://blank' as the code below will do. + // Instead, just make sure it's all lowercase, so direct string comparisons + // elsewhere will work. + if (base::LowerCaseEqualsASCII(trimmed, url::kAboutBlankURL)) + return GURL(url::kAboutBlankURL); + + // Parse and rebuild about: and chrome: URLs. bool chrome_url = - !base::LowerCaseEqualsASCII(trimmed, url::kAboutBlankURL) && - ((scheme == url::kAboutScheme) || (scheme == kChromeUIScheme)); + (scheme == url::kAboutScheme) || (scheme == kChromeUIScheme); // For some schemes whose layouts we understand, we rebuild it. if (chrome_url || |