chrome/browser/search_engines/template_url_parser.cc - Issue 343823002: Move GenerateSearchURL() and GenerateKeyword() from TemplateURLService to TemplateURL

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/search_engines/template_url_parser.cc

Issue 343823002: Move GenerateSearchURL() and GenerateKeyword() from TemplateURLService to TemplateURL (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move GenerateKeyword() Created 6 years, 6 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

« chrome/browser/search_engines/template_url.h ('K') | « chrome/browser/search_engines/template_url.cc ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_parser.cc

diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc

index aad9c668b0188140ae4e5e3a91416681fd064f07..f3481fd2a7fc319447758dd10019c6736641974c 100644

--- a/chrome/browser/search_engines/template_url_parser.cc

+++ b/chrome/browser/search_engines/template_url_parser.cc

@@ -14,7 +14,6 @@

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/search_engines/template_url.h"

-#include "chrome/browser/search_engines/template_url_service.h"

#include "chrome/browser/search_engines/ui_thread_search_terms_data.h"

#include "libxml/parser.h"

#include "libxml/xmlwriter.h"

@@ -299,7 +298,7 @@ TemplateURL* TemplateURLParsingContext::GetTemplateURL(

if (derive_image_from_url_ && data_.favicon_url.is_empty())

data_.favicon_url = TemplateURL::GenerateFaviconURL(search_url);

- data_.SetKeyword(TemplateURLService::GenerateKeyword(search_url));

+ data_.SetKeyword(TemplateURL::GenerateKeyword(search_url));

data_.show_in_default_list = show_in_default_list;

// Bail if the search URL is empty or if either TemplateURLRef is invalid.