| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <ostream> | 9 #include <ostream> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 816 if (backend_.get() && backend_initialized_) | 816 if (backend_.get() && backend_initialized_) |
| 817 return backend_->GetStatusSummary(); | 817 return backend_->GetStatusSummary(); |
| 818 else | 818 else |
| 819 return SyncBackendHost::Status::OFFLINE_UNUSABLE; | 819 return SyncBackendHost::Status::OFFLINE_UNUSABLE; |
| 820 } | 820 } |
| 821 | 821 |
| 822 SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() { | 822 SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() { |
| 823 if (backend_.get() && backend_initialized_) { | 823 if (backend_.get() && backend_initialized_) { |
| 824 return backend_->GetDetailedStatus(); | 824 return backend_->GetDetailedStatus(); |
| 825 } else { | 825 } else { |
| 826 SyncBackendHost::Status status = | 826 SyncBackendHost::Status status; |
| 827 { SyncBackendHost::Status::OFFLINE_UNUSABLE }; | 827 status.summary = SyncBackendHost::Status::OFFLINE_UNUSABLE; |
| 828 return status; | 828 return status; |
| 829 } | 829 } |
| 830 } | 830 } |
| 831 | 831 |
| 832 bool ProfileSyncService::SetupInProgress() const { | 832 bool ProfileSyncService::SetupInProgress() const { |
| 833 return !HasSyncSetupCompleted() && WizardIsVisible(); | 833 return !HasSyncSetupCompleted() && WizardIsVisible(); |
| 834 } | 834 } |
| 835 | 835 |
| 836 std::string ProfileSyncService::BuildSyncStatusSummaryText( | 836 std::string ProfileSyncService::BuildSyncStatusSummaryText( |
| 837 const sync_api::SyncManager::Status::Summary& summary) { | 837 const sync_api::SyncManager::Status::Summary& summary) { |
| (...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1377 // is initialized, all enabled data types are consistent with one | 1377 // is initialized, all enabled data types are consistent with one |
| 1378 // another, and no unrecoverable error has transpired. | 1378 // another, and no unrecoverable error has transpired. |
| 1379 if (unrecoverable_error_detected_) | 1379 if (unrecoverable_error_detected_) |
| 1380 return false; | 1380 return false; |
| 1381 | 1381 |
| 1382 if (!data_type_manager_.get()) | 1382 if (!data_type_manager_.get()) |
| 1383 return false; | 1383 return false; |
| 1384 | 1384 |
| 1385 return data_type_manager_->state() == DataTypeManager::CONFIGURED; | 1385 return data_type_manager_->state() == DataTypeManager::CONFIGURED; |
| 1386 } | 1386 } |
| OLD | NEW |