diff options
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_prefs.cc | 20 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_prefs.h | 3 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_prefs_unittest.cc | 3 |
4 files changed, 8 insertions, 20 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index ee4690a..5c17fb0 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -250,8 +250,6 @@ void ProfileSyncService::TrySyncDatatypePrefRecovery() { PrefService* const pref_service = profile_->GetPrefs(); if (!pref_service) return; - if (sync_prefs_.HasKeepEverythingSynced()) - return; const syncer::ModelTypeSet registered_types = GetRegisteredDataTypes(); if (sync_prefs_.GetPreferredDataTypes(registered_types).Size() > 1) return; diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc index 4a9f430..3d9be89 100644 --- a/chrome/browser/sync/sync_prefs.cc +++ b/chrome/browser/sync/sync_prefs.cc @@ -43,8 +43,7 @@ SyncPrefs::~SyncPrefs() { } // static -void SyncPrefs::RegisterUserPrefs(PrefService* prefs, - PrefRegistrySyncable* registry) { +void SyncPrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) { // TODO(joi): Remove |prefs| parameter. registry->RegisterBooleanPref(prefs::kSyncHasSetupCompleted, false, @@ -56,18 +55,11 @@ void SyncPrefs::RegisterUserPrefs(PrefService* prefs, 0, PrefRegistrySyncable::UNSYNCABLE_PREF); - // If you've never synced before, or if you're using Chrome OS or Android, - // all datatypes are on by default. - // TODO(nick): Perhaps a better model would be to always default to false, - // and explicitly call SetDataTypes() when the user shows the wizard. -#if defined(OS_CHROMEOS) || defined(OS_ANDROID) - bool enable_by_default = true; -#else - bool enable_by_default = !prefs->HasPrefPath(prefs::kSyncHasSetupCompleted); -#endif - + // All datatypes are on by default, but this gets set explicitly + // when you configure sync (when turning it on), in + // ProfileSyncService::OnUserChoseDatatypes. registry->RegisterBooleanPref(prefs::kSyncKeepEverythingSynced, - enable_by_default, + true, PrefRegistrySyncable::UNSYNCABLE_PREF); syncer::ModelTypeSet user_types = syncer::UserTypes(); @@ -82,7 +74,7 @@ void SyncPrefs::RegisterUserPrefs(PrefService* prefs, for (syncer::ModelTypeSet::Iterator it = user_types.First(); it.Good(); it.Inc()) { - RegisterDataTypePreferredPref(registry, it.Get(), enable_by_default); + RegisterDataTypePreferredPref(registry, it.Get(), true); } registry->RegisterBooleanPref(prefs::kSyncManaged, diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h index b0b2fb0..21b0c13 100644 --- a/chrome/browser/sync/sync_prefs.h +++ b/chrome/browser/sync/sync_prefs.h @@ -54,8 +54,7 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe), virtual ~SyncPrefs(); - static void RegisterUserPrefs(PrefService* prefs, - PrefRegistrySyncable* registry); + static void RegisterUserPrefs(PrefRegistrySyncable* registry); // Checks if sync is enabled for the profile that owns |io_data|. This must // be invoked on the IO thread, and can be used to check if sync is enabled diff --git a/chrome/browser/sync/sync_prefs_unittest.cc b/chrome/browser/sync/sync_prefs_unittest.cc index ea114f2..aa19c1a 100644 --- a/chrome/browser/sync/sync_prefs_unittest.cc +++ b/chrome/browser/sync/sync_prefs_unittest.cc @@ -21,8 +21,7 @@ using ::testing::StrictMock; class SyncPrefsTest : public testing::Test { protected: virtual void SetUp() OVERRIDE { - SyncPrefs::RegisterUserPrefs(&pref_service_, - pref_service_.registry()); + SyncPrefs::RegisterUserPrefs(pref_service_.registry()); } TestingPrefServiceSyncable pref_service_; |