chrome/browser/sync_file_system/sync_file_system_service.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_file_system/sync_file_system_service.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_file_system/sync_file_system_service.cc

diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc

index ca85aa39ccd3866c4dd5065f3851f6f714f540ef..4bdfe0c027df6f9c610523b1b22a1e5e347166b3 100644

--- a/chrome/browser/sync_file_system/sync_file_system_service.cc

+++ b/chrome/browser/sync_file_system/sync_file_system_service.cc

@@ -564,7 +564,7 @@ void SyncFileSystemService::UpdateSyncEnabledStatus(

ProfileSyncServiceBase* profile_sync_service) {

if (!profile_sync_service->HasSyncSetupCompleted())

return;

- sync_enabled_ = profile_sync_service->GetPreferredDataTypes().Has(

+ sync_enabled_ = profile_sync_service->GetActiveDataTypes().Has(

syncer::APPS);

remote_file_service_->SetSyncEnabled(sync_enabled_);

if (sync_enabled_) {