components/search_engines/template_url_service.cc - Issue 1238683003: Unpunycode search keywords and short names.

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 1238683003: Unpunycode search keywords and short names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: Restrict IDN-decoding to keywords generated from URL; Use prefs::kAcceptLanguages for IDN-decoding 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:

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 12abbe8b29415f6f9269a43349659ea7623576ff..a1cda479d4f462b2db8531f4387ed0a03b93c798 100644

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

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

@@ -2107,7 +2107,8 @@ base::string16 TemplateURLService::UniquifyKeyword(const TemplateURL& turl,

GURL gurl(turl.url());

if (gurl.is_valid() &&

(turl.GetType() != TemplateURL::OMNIBOX_API_EXTENSION)) {

- base::string16 keyword_candidate = TemplateURL::GenerateKeyword(gurl);

+ base::string16 keyword_candidate = TemplateURL::GenerateKeyword(

+ gurl, search_terms_data().GetAcceptedLanguages());

if (!GetTemplateURLForKeyword(keyword_candidate))

return keyword_candidate;

}