chrome/browser/sync/profile_sync_service_android.cc - Issue 16105012: Unrevert "[Sync] Split GetPreferredTypes into GetActiveType...""

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

Issue 16105012: Unrevert "[Sync] Split GetPreferredTypes into GetActiveType..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Adjust mock Created 7 years, 7 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:

Index: chrome/browser/sync/profile_sync_service_android.cc

diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc

index 8a57d7d4c43c682e72e8bd16b4068b3299fc886b..9198bb177a86e98416d44303b7eced7a46ff83cb 100644

--- a/chrome/browser/sync/profile_sync_service_android.cc

+++ b/chrome/browser/sync/profile_sync_service_android.cc

@@ -464,7 +464,7 @@ jboolean ProfileSyncServiceAndroid::IsSyncKeystoreMigrationDone(

jlong ProfileSyncServiceAndroid::GetEnabledDataTypes(JNIEnv* env,

jobject obj) {

jlong model_type_selection = 0;

- syncer::ModelTypeSet types = sync_service_->GetPreferredDataTypes();

+ syncer::ModelTypeSet types = sync_service_->GetActiveDataTypes();

types.PutAll(syncer::ControlTypes());

if (types.Has(syncer::BOOKMARKS)) {

model_type_selection |= BOOKMARK;