components/search_engines/template_url_service.h - Issue 2067723002: [sync] Search engine shortcuts get underscores at the end after sync

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.h

Issue 2067723002: [sync] Search engine shortcuts get underscores at the end after sync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: [sync] Search engine shortcuts get underscores at the end after sync Created 4 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_service_sync_unittest.cc ('K') | « chrome/browser/search_engines/template_url_service_sync_unittest.cc ('k') | components/search_engines/template_url_service.cc » ('j') | components/search_engines/template_url_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/search_engines/template_url_service.h

diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h

index 3f32b11e7443d989c9340e44f5ea01d01f9ccc60..551b357ffc4fc76dee31b1eb79d09784120cb947 100644

--- a/components/search_engines/template_url_service.h

+++ b/components/search_engines/template_url_service.h

@@ -621,9 +621,11 @@ class TemplateURLService : public WebDataServiceConsumer,

// of the following are true:

// * |local_turl|'s last_modified timestamp is newer than sync_turl.

// * |local_turl| is created by policy.

- // * |local_turl| is the local default search provider.

+ // * |prefer_local_default| is true and |local_turl| is the local default

+ // search provider

bool IsLocalTemplateURLBetter(const TemplateURL* local_turl,

- const TemplateURL* sync_turl);

+ const TemplateURL* sync_turl,

+ bool prefer_local_default = true);

// Given two synced TemplateURLs with a conflicting keyword, one of which

// needs to be added to or updated in the local model (|unapplied_sync_turl|)