diff options
| author | maxbogue <maxbogue@chromium.org> | 2016-01-25 17:56:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-26 01:58:06 +0000 |
| commit | 76b7de45b4592d5a09d2cfe8cdc1dde30ad67dc7 (patch) | |
| tree | a3ae8f0beffba83c5361dce76018ddc2f165d680 | |
| parent | 1eefe1cf48fc156be68c678a9e1d0523a22b7d13 (diff) | |
| download | chromium_src-76b7de45b4592d5a09d2cfe8cdc1dde30ad67dc7.zip chromium_src-76b7de45b4592d5a09d2cfe8cdc1dde30ad67dc7.tar.gz chromium_src-76b7de45b4592d5a09d2cfe8cdc1dde30ad67dc7.tar.bz2 | |
[Sync] Don't set sync requested when setting setup completed.
These flags are independent.
BUG=577385
Review URL: https://codereview.chromium.org/1586563004
Cr-Commit-Position: refs/heads/master@{#371417}
| -rw-r--r-- | chrome/browser/ui/sync/one_click_signin_sync_starter.cc | 4 | ||||
| -rw-r--r-- | components/sync_driver/sync_prefs.cc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc index 7fdaaae..1a00187 100644 --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc @@ -420,8 +420,10 @@ void OneClickSigninSyncStarter::OnSyncConfirmationUIClosed( content::RecordAction( base::UserMetricsAction("Signin_Signin_WithDefaultSyncSettings")); ProfileSyncService* profile_sync_service = GetProfileSyncService(); - if (profile_sync_service) + if (profile_sync_service) { profile_sync_service->SetFirstSetupComplete(); + profile_sync_service->RequestStart(); + } FinishProfileSyncServiceSetup(); } diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc index c448903..6cebfa7 100644 --- a/components/sync_driver/sync_prefs.cc +++ b/components/sync_driver/sync_prefs.cc @@ -129,7 +129,6 @@ bool SyncPrefs::IsFirstSetupComplete() const { void SyncPrefs::SetFirstSetupComplete() { DCHECK(CalledOnValidThread()); pref_service_->SetBoolean(prefs::kSyncFirstSetupComplete, true); - SetSyncRequested(true); } bool SyncPrefs::SyncHasAuthError() const { |