| 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 a8914fc0af7107c2cc72823f046f813ba7ba7450..039878f81233741543ccc9bf2c5f3dd4ba6c959e 100644
|
| --- a/chrome/browser/sync/profile_sync_service_android.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_android.cc
|
| @@ -340,13 +340,20 @@ jboolean ProfileSyncServiceAndroid::IsSyncKeystoreMigrationDone(
|
| return is_status_valid && !status.keystore_migration_time.is_null();
|
| }
|
|
|
| -jlong ProfileSyncServiceAndroid::GetEnabledDataTypes(JNIEnv* env,
|
| - jobject obj) {
|
| +jlong ProfileSyncServiceAndroid::GetActiveDataTypes(
|
| + JNIEnv* env, jobject obj) {
|
| syncer::ModelTypeSet types = sync_service_->GetActiveDataTypes();
|
| types.PutAll(syncer::ControlTypes());
|
| return ModelTypeSetToSelection(types);
|
| }
|
|
|
| +jlong ProfileSyncServiceAndroid::GetPreferredDataTypes(
|
| + JNIEnv* env, jobject obj) {
|
| + syncer::ModelTypeSet types = sync_service_->GetPreferredDataTypes();
|
| + types.PutAll(syncer::ControlTypes());
|
| + return ModelTypeSetToSelection(types);
|
| +}
|
| +
|
| void ProfileSyncServiceAndroid::SetPreferredDataTypes(
|
| JNIEnv* env, jobject obj,
|
| jboolean sync_everything,
|
|
|