| 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.h" |  | 
| 9 #include "chrome/browser/sync/profile_sync_service_factory.h" | 8 #include "chrome/browser/sync/profile_sync_service_factory.h" | 
|  | 9 #include "components/browser_sync/browser/profile_sync_service.h" | 
| 10 | 10 | 
| 11 SyncStartupTracker::SyncStartupTracker(Profile* profile, Observer* observer) | 11 SyncStartupTracker::SyncStartupTracker(Profile* profile, Observer* observer) | 
| 12     : profile_(profile), | 12     : profile_(profile), | 
| 13       observer_(observer) { | 13       observer_(observer) { | 
| 14   ProfileSyncService* service = ProfileSyncServiceFactory::GetForProfile( | 14   ProfileSyncService* service = ProfileSyncServiceFactory::GetForProfile( | 
| 15       profile_); | 15       profile_); | 
| 16   if (service) | 16   if (service) | 
| 17     service->AddObserver(this); | 17     service->AddObserver(this); | 
| 18 | 18 | 
| 19   CheckServiceState(); | 19   CheckServiceState(); | 
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 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 backend 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 | 
|---|