chrome/browser/sync/profile_sync_factory_impl.cc - Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

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/sync/profile_sync_factory_impl.cc

Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Merge to TOT and fixed additional conflicts from rsimha. Created 9 years, 1 month 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_service_sync_unittest.cc ('k') | chrome/browser/sync/profile_sync_factory_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_factory_impl.cc

===================================================================

--- chrome/browser/sync/profile_sync_factory_impl.cc (revision 109292)

+++ chrome/browser/sync/profile_sync_factory_impl.cc (working copy)

@@ -153,6 +153,13 @@

new TypedUrlDataTypeController(this, profile_));

}

+ // Search Engine sync is enabled by default. Register only if explicitly

+ // disabled.

+ if (!command_line_->HasSwitch(switches::kDisableSyncSearchEngines)) {

+ pss->RegisterDataTypeController(

+ new SearchEngineDataTypeController(this, profile_, pss));

+ }

// Session sync is disabled by default. Register only if explicitly

// enabled.

if (command_line_->HasSwitch(switches::kEnableSyncTabs)) {

@@ -176,13 +183,6 @@

new AutofillProfileDataTypeController(this, profile_));

}

- // Search Engine sync is disabled by default. Register only if explicitly

- // enabled.

- if (command_line_->HasSwitch(switches::kEnableSyncSearchEngines)) {

- pss->RegisterDataTypeController(

- new SearchEngineDataTypeController(this, profile_, pss));

- }

// App notifications sync is disabled by default. Register only if

// explicitly enabled.

if (command_line_->HasSwitch(switches::kEnableSyncAppNotifications)) {