| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #ifdef CHROME_PERSONALIZATION | 5 #ifdef CHROME_PERSONALIZATION |
| 6 #include "chrome/browser/sync/profile_sync_service.h" | 6 #include "chrome/browser/sync/profile_sync_service.h" |
| 7 | 7 |
| 8 #include <stack> | 8 #include <stack> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 const sync_api::SyncManager::Status::Summary& summary) { | 294 const sync_api::SyncManager::Status::Summary& summary) { |
| 295 switch (summary) { | 295 switch (summary) { |
| 296 case sync_api::SyncManager::Status::OFFLINE: | 296 case sync_api::SyncManager::Status::OFFLINE: |
| 297 return L"OFFLINE"; | 297 return L"OFFLINE"; |
| 298 case sync_api::SyncManager::Status::OFFLINE_UNSYNCED: | 298 case sync_api::SyncManager::Status::OFFLINE_UNSYNCED: |
| 299 return L"OFFLINE_UNSYNCED"; | 299 return L"OFFLINE_UNSYNCED"; |
| 300 case sync_api::SyncManager::Status::SYNCING: | 300 case sync_api::SyncManager::Status::SYNCING: |
| 301 return L"SYNCING"; | 301 return L"SYNCING"; |
| 302 case sync_api::SyncManager::Status::READY: | 302 case sync_api::SyncManager::Status::READY: |
| 303 return L"READY"; | 303 return L"READY"; |
| 304 case sync_api::SyncManager::Status::PAUSED: | |
| 305 return L"PAUSED"; | |
| 306 case sync_api::SyncManager::Status::CONFLICT: | 304 case sync_api::SyncManager::Status::CONFLICT: |
| 307 return L"CONFLICT"; | 305 return L"CONFLICT"; |
| 308 case sync_api::SyncManager::Status::OFFLINE_UNUSABLE: | 306 case sync_api::SyncManager::Status::OFFLINE_UNUSABLE: |
| 309 return L"OFFLINE_UNUSABLE"; | 307 return L"OFFLINE_UNUSABLE"; |
| 310 case sync_api::SyncManager::Status::INVALID: // fall through | 308 case sync_api::SyncManager::Status::INVALID: // fall through |
| 311 default: | 309 default: |
| 312 return L"UNKNOWN"; | 310 return L"UNKNOWN"; |
| 313 } | 311 } |
| 314 } | 312 } |
| 315 | 313 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 } | 419 } |
| 422 | 420 |
| 423 bool ProfileSyncService::ShouldPushChanges() { | 421 bool ProfileSyncService::ShouldPushChanges() { |
| 424 // True only after all bootstrapping has succeeded: the bookmark model is | 422 // True only after all bootstrapping has succeeded: the bookmark model is |
| 425 // loaded, the sync backend is initialized, the two domains are | 423 // loaded, the sync backend is initialized, the two domains are |
| 426 // consistent with one another, and no unrecoverable error has transpired. | 424 // consistent with one another, and no unrecoverable error has transpired. |
| 427 return change_processor_->IsRunning(); | 425 return change_processor_->IsRunning(); |
| 428 } | 426 } |
| 429 | 427 |
| 430 #endif // CHROME_PERSONALIZATION | 428 #endif // CHROME_PERSONALIZATION |
| OLD | NEW |