From 90437dd218ba09f01612ebfc47eda167d67fb368 Mon Sep 17 00:00:00 2001 From: jochen Date: Tue, 4 Aug 2015 00:05:17 -0700 Subject: 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} --- chrome/browser/ui/webui/options/startup_pages_handler.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/ui/webui/options/startup_pages_handler.cc') diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc index 6f9946c..c8ebc9a 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.cc +++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc @@ -21,7 +21,7 @@ #include "components/omnibox/browser/autocomplete_controller.h" #include "components/omnibox/browser/autocomplete_input.h" #include "components/omnibox/browser/autocomplete_result.h" -#include "components/url_formatter/url_fixer.h" +#include "components/url_fixer/url_fixer.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/web_ui.h" @@ -163,7 +163,7 @@ void StartupPagesHandler::AddStartupPage(const base::ListValue* args) { std::string url_string; CHECK(args->GetString(0, &url_string)); - GURL url = url_formatter::FixupURL(url_string, std::string()); + GURL url = url_fixer::FixupURL(url_string, std::string()); if (!url.is_valid()) return; @@ -188,7 +188,7 @@ void StartupPagesHandler::EditStartupPage(const base::ListValue* args) { return; } - fixed_url = url_formatter::FixupURL(url_string, std::string()); + fixed_url = url_fixer::FixupURL(url_string, std::string()); if (!fixed_url.is_empty()) { std::vector urls = startup_custom_pages_table_model_->GetURLs(); urls[index] = fixed_url; -- cgit v1.1