| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/sync_startup_tracker.h" | 5 #include "chrome/browser/sync/sync_startup_tracker.h" |
| 6 | 6 |
| 7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 8 #include "chrome/browser/sync/profile_sync_service_factory.h" | 8 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 9 #include "components/browser_sync/profile_sync_service.h" | 9 #include "components/browser_sync/profile_sync_service.h" |
| 10 | 10 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 return SYNC_STARTUP_ERROR; | 54 return SYNC_STARTUP_ERROR; |
| 55 | 55 |
| 56 browser_sync::ProfileSyncService* service = | 56 browser_sync::ProfileSyncService* service = |
| 57 ProfileSyncServiceFactory::GetForProfile(profile); | 57 ProfileSyncServiceFactory::GetForProfile(profile); |
| 58 | 58 |
| 59 // If no service exists or it can't be started, treat as a startup error. | 59 // If no service exists or it can't be started, treat as a startup error. |
| 60 if (!service || !service->CanSyncStart()) { | 60 if (!service || !service->CanSyncStart()) { |
| 61 return SYNC_STARTUP_ERROR; | 61 return SYNC_STARTUP_ERROR; |
| 62 } | 62 } |
| 63 | 63 |
| 64 // If the sync backend has started up, notify the callback. | 64 // If the sync engine has started up, notify the callback. |
| 65 if (service->IsBackendInitialized()) | 65 if (service->IsEngineInitialized()) |
| 66 return SYNC_STARTUP_COMPLETE; | 66 return SYNC_STARTUP_COMPLETE; |
| 67 | 67 |
| 68 // If the sync service has some kind of error, report to the user. | 68 // If the sync service has some kind of error, report to the user. |
| 69 if (service->HasUnrecoverableError()) | 69 if (service->HasUnrecoverableError()) |
| 70 return SYNC_STARTUP_ERROR; | 70 return SYNC_STARTUP_ERROR; |
| 71 | 71 |
| 72 // If we have an auth error and sync is not still waiting for new auth tokens | 72 // If we have an auth error and sync is not still waiting for new auth tokens |
| 73 // to be fetched, exit. | 73 // to be fetched, exit. |
| 74 if (!service->waiting_for_auth() && | 74 if (!service->waiting_for_auth() && |
| 75 service->GetAuthError().state() != GoogleServiceAuthError::NONE) { | 75 service->GetAuthError().state() != GoogleServiceAuthError::NONE) { |
| 76 return SYNC_STARTUP_ERROR; | 76 return SYNC_STARTUP_ERROR; |
| 77 } | 77 } |
| 78 | 78 |
| 79 // No error detected yet, but the sync backend hasn't started up yet, so | 79 // No error detected yet, but the sync engine hasn't started up yet, so |
| 80 // we're in the pending state. | 80 // we're in the pending state. |
| 81 return SYNC_STARTUP_PENDING; | 81 return SYNC_STARTUP_PENDING; |
| 82 } | 82 } |
| OLD | NEW |