diff options
author | rsleevi <rsleevi@chromium.org> | 2015-08-07 14:39:21 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-07 21:39:50 +0000 |
commit | 24f64dc221628032b7843f1af6b277a7f0d6c562 (patch) | |
tree | ba2c4bb1d37847b2cd76a4d8d243d1f000e0284e /components/app_modal/javascript_dialog_manager.cc | |
parent | d9773981c8733eb55314efad66398350f862c8be (diff) | |
download | chromium_src-24f64dc221628032b7843f1af6b277a7f0d6c562.zip chromium_src-24f64dc221628032b7843f1af6b277a7f0d6c562.tar.gz chromium_src-24f64dc221628032b7843f1af6b277a7f0d6c562.tar.bz2 |
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
Review URL: https://codereview.chromium.org/1171333003
Cr-Commit-Position: refs/heads/master@{#342445}
Diffstat (limited to 'components/app_modal/javascript_dialog_manager.cc')
-rw-r--r-- | components/app_modal/javascript_dialog_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/app_modal/javascript_dialog_manager.cc b/components/app_modal/javascript_dialog_manager.cc index f426e4a..ccf566a 100644 --- a/components/app_modal/javascript_dialog_manager.cc +++ b/components/app_modal/javascript_dialog_manager.cc @@ -12,6 +12,7 @@ #include "components/app_modal/javascript_dialog_extensions_client.h" #include "components/app_modal/javascript_native_dialog_factory.h" #include "components/app_modal/native_app_modal_dialog.h" +#include "components/url_formatter/url_formatter.h" #include "content/public/common/javascript_message_type.h" #include "grit/components_strings.h" #include "net/base/net_util.h" @@ -209,7 +210,7 @@ base::string16 JavaScriptDialogManager::GetTitle( // Otherwise, return the formatted URL. // In this case, force URL to have LTR directionality. - base::string16 url_string = net::FormatUrl(origin_url, accept_lang); + base::string16 url_string = url_formatter::FormatUrl(origin_url, accept_lang); return l10n_util::GetStringFUTF16( is_alert ? IDS_JAVASCRIPT_ALERT_TITLE : IDS_JAVASCRIPT_MESSAGEBOX_TITLE, |