summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/session_startup_pref.cc
diff options
context:
space:
mode:
authorrsleevi <rsleevi@chromium.org>2015-08-03 13:47:03 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-03 20:47:42 +0000
commit1659865c3eb47166c82378bb840801135b057a09 (patch)
tree7cd31e008e6097a080a0c6d2f879fc880c3a475b /chrome/browser/prefs/session_startup_pref.cc
parent16f99512ca431c0d2f21cf94f3a7997bbd64d8c0 (diff)
downloadchromium_src-1659865c3eb47166c82378bb840801135b057a09.zip
chromium_src-1659865c3eb47166c82378bb840801135b057a09.tar.gz
chromium_src-1659865c3eb47166c82378bb840801135b057a09.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@{#341605}
Diffstat (limited to 'chrome/browser/prefs/session_startup_pref.cc')
-rw-r--r--chrome/browser/prefs/session_startup_pref.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc
index 996adc84..b75739f 100644
--- a/chrome/browser/prefs/session_startup_pref.cc
+++ b/chrome/browser/prefs/session_startup_pref.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/pref_registry/pref_registry_syncable.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
#if defined(OS_MACOSX)
#include "chrome/browser/ui/cocoa/window_restore_utils.h"
@@ -54,7 +54,7 @@ void URLListToPref(const base::ListValue* url_list, SessionStartupPref* pref) {
for (size_t i = 0; i < url_list->GetSize(); ++i) {
std::string url_text;
if (url_list->GetString(i, &url_text)) {
- GURL fixed_url = url_fixer::FixupURL(url_text, std::string());
+ GURL fixed_url = url_formatter::FixupURL(url_text, std::string());
pref->urls.push_back(fixed_url);
}
}