chrome/browser/supervised_user/supervised_user_url_filter.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/supervised_user/supervised_user_url_filter.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: Fix Android checkdeps Created 5 years, 4 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

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | components/url_formatter/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_url_filter.cc

diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc

index 667fc25069c1988b65753a7307e2c3524150987e..d40168073f7a21e5020046a6a92a988875a00904 100644

--- a/chrome/browser/supervised_user/supervised_user_url_filter.cc

+++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc

@@ -19,7 +19,7 @@

#include "chrome/browser/supervised_user/experimental/supervised_user_blacklist.h"

#include "chrome/grit/generated_resources.h"

#include "components/policy/core/browser/url_blacklist_manager.h"

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

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

#include "components/url_matcher/url_matcher.h"

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

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

@@ -95,7 +95,7 @@ bool FilterBuilder::AddPattern(const std::string& pattern, int site_id) {

std::string query;

bool match_subdomains = true;

URLBlacklist::SegmentURLCallback callback =

- static_cast<URLBlacklist::SegmentURLCallback>(url_fixer::SegmentURL);

+ static_cast<URLBlacklist::SegmentURLCallback>(url_formatter::SegmentURL);

if (!URLBlacklist::FilterToComponents(

callback, pattern,

&scheme, &host, &match_subdomains, &port, &path, &query)) {

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc ('k') | chrome/browser/ui/BUILD.gn » ('j') | components/url_formatter/BUILD.gn » ('J')