components/search_engines/template_url_service.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: components/search_engines/template_url_service.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: components/search_engines/template_url_service.cc

diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc

index a6b137b437402f5a9fca7504f08af464586fef23..4098c0d393531d1cc1e3785b15cc05163f2c2159 100644

--- a/components/search_engines/template_url_service.cc

+++ b/components/search_engines/template_url_service.cc

@@ -32,7 +32,7 @@

#include "components/search_engines/template_url_service_client.h"

#include "components/search_engines/template_url_service_observer.h"

#include "components/search_engines/util.h"

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

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

#include "net/base/net_util.h"

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

#include "sync/api/sync_change.h"

@@ -1725,8 +1725,8 @@ void TemplateURLService::AddTabToSearchVisit(const TemplateURL& t_url) {

if (!client_)

return;

- GURL url(

- url_fixer::FixupURL(base::UTF16ToUTF8(t_url.keyword()), std::string()));

+ GURL url(url_formatter::FixupURL(base::UTF16ToUTF8(t_url.keyword()),

+ std::string()));

if (!url.is_valid())

return;

« no previous file with comments | « components/search_engines/template_url.cc ('k') | components/secure_display.gypi » ('j') | components/url_formatter/DEPS » ('J')