| 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 "chrome/browser/sync/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1720 | 1720 |
| 1721 base::Time ProfileSyncService::GetExplicitPassphraseTime() const { | 1721 base::Time ProfileSyncService::GetExplicitPassphraseTime() const { |
| 1722 return backend_->GetExplicitPassphraseTime(); | 1722 return backend_->GetExplicitPassphraseTime(); |
| 1723 } | 1723 } |
| 1724 | 1724 |
| 1725 bool ProfileSyncService::IsCryptographerReady( | 1725 bool ProfileSyncService::IsCryptographerReady( |
| 1726 const syncer::BaseTransaction* trans) const { | 1726 const syncer::BaseTransaction* trans) const { |
| 1727 return backend_.get() && backend_->IsCryptographerReady(trans); | 1727 return backend_.get() && backend_->IsCryptographerReady(trans); |
| 1728 } | 1728 } |
| 1729 | 1729 |
| 1730 SyncBackendHost* ProfileSyncService::GetBackendForTest() { | |
| 1731 // We don't check |backend_initialized_|; we assume the test class | |
| 1732 // knows what it's doing. | |
| 1733 return backend_.get(); | |
| 1734 } | |
| 1735 | |
| 1736 void ProfileSyncService::ConfigurePriorityDataTypes() { | 1730 void ProfileSyncService::ConfigurePriorityDataTypes() { |
| 1737 const syncer::ModelTypeSet priority_types = | 1731 const syncer::ModelTypeSet priority_types = |
| 1738 Intersection(GetPreferredDataTypes(), syncer::PriorityUserTypes()); | 1732 Intersection(GetPreferredDataTypes(), syncer::PriorityUserTypes()); |
| 1739 if (!priority_types.Empty()) { | 1733 if (!priority_types.Empty()) { |
| 1740 const syncer::ConfigureReason reason = HasSyncSetupCompleted() ? | 1734 const syncer::ConfigureReason reason = HasSyncSetupCompleted() ? |
| 1741 syncer::CONFIGURE_REASON_RECONFIGURATION : | 1735 syncer::CONFIGURE_REASON_RECONFIGURATION : |
| 1742 syncer::CONFIGURE_REASON_NEW_CLIENT; | 1736 syncer::CONFIGURE_REASON_NEW_CLIENT; |
| 1743 data_type_manager_->Configure(priority_types, reason); | 1737 data_type_manager_->Configure(priority_types, reason); |
| 1744 } | 1738 } |
| 1745 } | 1739 } |
| (...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2252 SyncTokenStatus status; | 2246 SyncTokenStatus status; |
| 2253 status.connection_status_update_time = connection_status_update_time_; | 2247 status.connection_status_update_time = connection_status_update_time_; |
| 2254 status.connection_status = connection_status_; | 2248 status.connection_status = connection_status_; |
| 2255 status.token_request_time = token_request_time_; | 2249 status.token_request_time = token_request_time_; |
| 2256 status.token_receive_time = token_receive_time_; | 2250 status.token_receive_time = token_receive_time_; |
| 2257 status.last_get_token_error = last_get_token_error_; | 2251 status.last_get_token_error = last_get_token_error_; |
| 2258 if (request_access_token_retry_timer_.IsRunning()) | 2252 if (request_access_token_retry_timer_.IsRunning()) |
| 2259 status.next_token_request_time = next_token_request_time_; | 2253 status.next_token_request_time = next_token_request_time_; |
| 2260 return status; | 2254 return status; |
| 2261 } | 2255 } |
| OLD | NEW |