chrome/browser/search_engines/template_url_prepopulate_data.cc - Issue 12084076: Ensure post-sync TemplateURL of prepopulated engines use built-in version.

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_prepopulate_data.cc

Issue 12084076: Ensure post-sync TemplateURL of prepopulated engines use built-in version. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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/search_engines/template_url_prepopulate_data.h ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | chrome/browser/search_engines/template_url_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_prepopulate_data.cc

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

index b2a857bcef5c5ab529f8b269d3a0ee8535b4c701..af89a8658fa0eac187984e2646ca960776509744 100644

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

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

@@ -1210,6 +1210,15 @@ TemplateURL* MakePrepopulatedTemplateURLFromPrepopulateEngine(

engine.search_terms_replacement_key, engine.id);

}

+TemplateURL* MakeTemplateURLFromPrepopulateId(Profile* profile,

+ int prepopulate_id) {

+ const PrepopulatedEngine* engine =

+ GetPrepopulatedEngineFromID(prepopulate_id);

+ if (engine == NULL)

Peter Kasting 2013/01/30 22:32:33 Nit: Or: return engine ? MakePrepopulatedTemplate

beaudoin 2013/02/01 21:12:38 Function gone.

+ return NULL;

+ return MakePrepopulatedTemplateURLFromPrepopulateEngine(profile, *engine);

void GetPrepopulatedEngines(Profile* profile,

std::vector<TemplateURL*>* t_urls,

size_t* default_search_provider_index) {