components/sync_driver/sync_prefs.cc - Issue 1222203008: [Sync] Add priority preferences datatype for mobile

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/sync_driver/sync_prefs.cc

Issue 1222203008: [Sync] Add priority preferences datatype for mobile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test Created 5 years, 5 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/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java ('K') | « chrome/browser/sync/profile_sync_service_android.cc ('k') | sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/sync_driver/sync_prefs.cc

diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc

index 03fb65a34ac149063aa1840f95dfb311c411e8e8..def047f224b02fe0af5290c00a4e0a88a1a007ec 100644

--- a/components/sync_driver/sync_prefs.cc

+++ b/components/sync_driver/sync_prefs.cc

@@ -200,8 +200,8 @@ syncer::ModelTypeSet SyncPrefs::GetPreferredDataTypes(

void SyncPrefs::SetPreferredDataTypes(syncer::ModelTypeSet registered_types,

syncer::ModelTypeSet preferred_types) {

DCHECK(CalledOnValidThread());

- DCHECK(registered_types.HasAll(preferred_types));

preferred_types = ResolvePrefGroups(registered_types, preferred_types);

+ DCHECK(registered_types.HasAll(preferred_types));

for (syncer::ModelTypeSet::Iterator i = registered_types.First(); i.Good();

i.Inc()) {

SetDataTypePreferred(i.Get(), preferred_types.Has(i.Get()));

@@ -432,7 +432,6 @@ void SyncPrefs::SetDataTypePreferred(syncer::ModelType type,

syncer::ModelTypeSet SyncPrefs::ResolvePrefGroups(

syncer::ModelTypeSet registered_types,

syncer::ModelTypeSet types) const {

- DCHECK(registered_types.HasAll(types));

syncer::ModelTypeSet types_with_groups = types;

for (PrefGroupsMap::const_iterator i = pref_groups_.begin();

i != pref_groups_.end();