chrome/browser/search_engines/util.h - 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/util.h

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: Changed according to stevet comments. Created 7 years, 10 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_service_sync_unittest.cc ('K') | « chrome/browser/search_engines/template_url_service_unittest.cc ('k') | chrome/browser/search_engines/util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/util.h

diff --git a/chrome/browser/search_engines/util.h b/chrome/browser/search_engines/util.h

index 41a20df9eb80470e8f6143390683385854b1c8f5..432569f363a2cd3f3485d1df4a2019264afdc41d 100644

--- a/chrome/browser/search_engines/util.h

+++ b/chrome/browser/search_engines/util.h

@@ -23,6 +23,11 @@ class WebDataService;

// none is set. |profile| may be NULL.

string16 GetDefaultSearchEngineName(Profile* profile);

+// Modifies |prepopulated_url| so that it contains user-modified fields from

+// |original_turl|. Both URLs must have the same prepopulate_id.

+void MergeIntoPrepopulatedEngineData(TemplateURLData* prepopulated_url,

+ const TemplateURL* original_turl);

// Processes the results of WebDataService::GetKeywords, combining it with

// prepopulated search providers to result in:

// * a set of template_urls (search providers). The caller owns the