diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
| commit | f8ee788a64d60abd8f2d742a5fdedde054ecd910 (patch) | |
| tree | 7dc14380200b953c64e0ccd16435cdbd1dbf1205 /chrome/browser/sync/backup_rollback_controller.cc | |
| parent | fcbbbe23a38088a52492922075e71a419c4b01ec (diff) | |
| download | chromium_org-f8ee788a64d60abd8f2d742a5fdedde054ecd910.tar.gz | |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
Diffstat (limited to 'chrome/browser/sync/backup_rollback_controller.cc')
| -rw-r--r-- | chrome/browser/sync/backup_rollback_controller.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/sync/backup_rollback_controller.cc b/chrome/browser/sync/backup_rollback_controller.cc index 2866074608..1f0de17a67 100644 --- a/chrome/browser/sync/backup_rollback_controller.cc +++ b/chrome/browser/sync/backup_rollback_controller.cc @@ -34,11 +34,16 @@ BackupRollbackController::~BackupRollbackController() { void BackupRollbackController::Start(base::TimeDelta delay) { #if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kSyncEnableBackupRollback)) { + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kSyncDisableBackup)) { return; } + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kSyncEnableRollback)) { + sync_prefs_->SetRemainingRollbackTries(0); + } + if (delay == base::TimeDelta()) { TryStart(); } else { |