chrome/browser/importer/in_process_importer_bridge.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/importer/in_process_importer_bridge.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

« no previous file with comments | « chrome/browser/autocomplete/base_search_provider.cc ('k') | chrome/browser/profile_resetter/resettable_settings_snapshot.cc » ('j') | chrome/browser/search_engines/template_url.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/importer/in_process_importer_bridge.cc

diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc

index 8ab3c0956ad68772ceb0af96550104443b3cf061..320edf2befbe6832ed83a9761c0b46b72e176d69 100644

--- a/chrome/browser/importer/in_process_importer_bridge.cc

+++ b/chrome/browser/importer/in_process_importer_bridge.cc

@@ -11,7 +11,6 @@

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

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

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

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

#include "chrome/common/importer/imported_bookmark_entry.h"

#include "chrome/common/importer/imported_favicon_usage.h"

#include "components/autofill/core/common/password_form.h"

@@ -99,7 +98,7 @@ TemplateURL* CreateTemplateURL(const base::string16& title,

TemplateURLData data;

if (keyword.empty())

- data.SetKeyword(TemplateURLService::GenerateKeyword(url));

+ data.SetKeyword(TemplateURL::GenerateKeyword(url));

else

data.SetKeyword(keyword);

// We set short name by using the title if it exists.