| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/browser_sync/profile_sync_service.h" | 5 #include "components/browser_sync/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cstddef> | 9 #include <cstddef> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1439 ClearAndRestartSyncForPassphraseEncryption(); | 1439 ClearAndRestartSyncForPassphraseEncryption(); |
| 1440 return; | 1440 return; |
| 1441 } | 1441 } |
| 1442 | 1442 |
| 1443 StartSyncingWithServer(); | 1443 StartSyncingWithServer(); |
| 1444 } | 1444 } |
| 1445 | 1445 |
| 1446 void ProfileSyncService::OnConfigureStart() { | 1446 void ProfileSyncService::OnConfigureStart() { |
| 1447 DCHECK(thread_checker_.CalledOnValidThread()); | 1447 DCHECK(thread_checker_.CalledOnValidThread()); |
| 1448 sync_configure_start_time_ = base::Time::Now(); | 1448 sync_configure_start_time_ = base::Time::Now(); |
| 1449 engine_->StartConfiguration(); | |
| 1450 NotifyObservers(); | 1449 NotifyObservers(); |
| 1451 } | 1450 } |
| 1452 | 1451 |
| 1453 ProfileSyncService::SyncStatusSummary | 1452 ProfileSyncService::SyncStatusSummary |
| 1454 ProfileSyncService::QuerySyncStatusSummary() { | 1453 ProfileSyncService::QuerySyncStatusSummary() { |
| 1455 DCHECK(thread_checker_.CalledOnValidThread()); | 1454 DCHECK(thread_checker_.CalledOnValidThread()); |
| 1456 if (HasUnrecoverableError()) { | 1455 if (HasUnrecoverableError()) { |
| 1457 return UNRECOVERABLE_ERROR; | 1456 return UNRECOVERABLE_ERROR; |
| 1458 } else if (!engine_) { | 1457 } else if (!engine_) { |
| 1459 return NOT_ENABLED; | 1458 return NOT_ENABLED; |
| (...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2634 | 2633 |
| 2635 DCHECK(startup_controller_->IsSetupInProgress()); | 2634 DCHECK(startup_controller_->IsSetupInProgress()); |
| 2636 startup_controller_->SetSetupInProgress(false); | 2635 startup_controller_->SetSetupInProgress(false); |
| 2637 | 2636 |
| 2638 if (IsEngineInitialized()) | 2637 if (IsEngineInitialized()) |
| 2639 ReconfigureDatatypeManager(); | 2638 ReconfigureDatatypeManager(); |
| 2640 NotifyObservers(); | 2639 NotifyObservers(); |
| 2641 } | 2640 } |
| 2642 | 2641 |
| 2643 } // namespace browser_sync | 2642 } // namespace browser_sync |
| OLD | NEW |