chrome/browser/profiles/profile_io_data.cc - Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fold in secure_display to url_formatter Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/profiles/profile_io_data.cc

diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc

index 73f9efbd44439248fb9a8e8ee81d64a5f897133a..d0657488516fc1b261537d41e15e3ab32ed3fb64 100644

--- a/chrome/browser/profiles/profile_io_data.cc

+++ b/chrome/browser/profiles/profile_io_data.cc

@@ -58,7 +58,7 @@

#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"

#include "components/dom_distiller/core/url_constants.h"

#include "components/sync_driver/pref_names.h"

-#include "components/url_fixer/url_fixer.h"

+#include "components/url_formatter/url_fixer.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/host_zoom_map.h"

#include "content/public/browser/notification_service.h"

@@ -508,7 +508,7 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {

#if defined(ENABLE_CONFIGURATION_POLICY)

policy::URLBlacklist::SegmentURLCallback callback =

static_cast<policy::URLBlacklist::SegmentURLCallback>(

- url_fixer::SegmentURL);

+ url_formatter::SegmentURL);

base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool();

scoped_refptr<base::SequencedTaskRunner> background_task_runner =

pool->GetSequencedTaskRunner(pool->GetSequenceToken());

« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/ssl/captive_portal_blocking_page.cc » ('j') | components/url_formatter/DEPS » ('J')