diff options
author | jochen <jochen@chromium.org> | 2015-08-04 00:05:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 07:05:48 +0000 |
commit | 90437dd218ba09f01612ebfc47eda167d67fb368 (patch) | |
tree | 77d2fe1ff3c1830af96a8e03c32419c5b5634522 /chrome/browser/browser_about_handler.cc | |
parent | 31ad3e6a80c367c4f8ea0a921e8f2cfe555a5fd6 (diff) | |
download | chromium_src-90437dd218ba09f01612ebfc47eda167d67fb368.zip chromium_src-90437dd218ba09f01612ebfc47eda167d67fb368.tar.gz chromium_src-90437dd218ba09f01612ebfc47eda167d67fb368.tar.bz2 |
Revert of Move net::FormatUrl and friends outside of //net and into //components (patchset #16 id:290001 of https://codereview.chromium.org/1171333003/ )
Reason for revert:
breaks gn_check on Android: https://build.chromium.org/p/chromium.linux/builders/Android%20GN/builds/28796/steps/gn_check/logs/stdio
Original issue's description:
> Move net::FormatUrl and friends outside of //net and into //components
>
> net::FormatUrl and related are specifically concerned with display
> policies of URLs, which is not something that //net needs to be aware
> of, as that's a UX question.
>
> This folds in net::FormatURL along with the existing //components/url_fixer
> and //components/secure_display into a common component,
> //components/url_formatter, that handles reformatting URLs for user-friendly
> or data storage (url_formatter), for use in security prompts (elide_url),
> or for reformatting URLs from user input (url_fixer)
>
> (Disabling presubmit since this is intentionally not fixing a legacy API, just moving it for future cleanups)
>
> BUG=486979
> NOPRESUBMIT=true
>
> Committed: https://crrev.com/1659865c3eb47166c82378bb840801135b057a09
> Cr-Commit-Position: refs/heads/master@{#341605}
TBR=droger@chromium.org,jam@chromium.org,mkwst@chromium.org,pkasting@chromium.org,sky@chromium.org,stuartmorgan@chromium.org,felt@chromium.org,rsleevi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=486979
Review URL: https://codereview.chromium.org/1260033005
Cr-Commit-Position: refs/heads/master@{#341691}
Diffstat (limited to 'chrome/browser/browser_about_handler.cc')
-rw-r--r-- | chrome/browser/browser_about_handler.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 616d290..4142dec4 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" -#include "components/url_formatter/url_fixer.h" +#include "components/url_fixer/url_fixer.h" bool FixupBrowserAboutURL(GURL* url, content::BrowserContext* browser_context) { @@ -24,7 +24,7 @@ bool FixupBrowserAboutURL(GURL* url, // phase that determines the virtual URL, by including it in an initial // URLHandler. This prevents minor changes from producing a virtual URL, // which could lead to a URL spoof. - *url = url_formatter::FixupURL(url->possibly_invalid_spec(), std::string()); + *url = url_fixer::FixupURL(url->possibly_invalid_spec(), std::string()); return true; } @@ -34,11 +34,11 @@ bool WillHandleBrowserAboutURL(GURL* url, // then hopefully we can remove this forced fixup. FixupBrowserAboutURL(url, browser_context); - // Check that about: URLs are fixed up to chrome: by url_formatter::FixupURL. + // Check that about: URLs are fixed up to chrome: by url_fixer::FixupURL. DCHECK((*url == GURL(url::kAboutBlankURL)) || !url->SchemeIs(url::kAboutScheme)); - // Only handle chrome://foo/, url_formatter::FixupURL translates about:foo. + // Only handle chrome://foo/, url_fixer::FixupURL translates about:foo. if (!url->SchemeIs(content::kChromeUIScheme)) return false; |