Index: chrome/browser/sync/profile_sync_service.h |
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h |
index c05d70b42d40e83bbfcc10844ef4032bc08bff5c..137aba7f803769f9d9bf1ef4a2dcfacebdef2cea 100644 |
--- a/chrome/browser/sync/profile_sync_service.h |
+++ b/chrome/browser/sync/profile_sync_service.h |
@@ -319,14 +319,13 @@ class ProfileSyncService : public browser_sync::SyncFrontend, |
return unrecoverable_error_location_; |
} |
- // Tracks whether the user is currently authenticating or not. This is used |
+ // Reports whether the user is currently authenticating or not. This is used |
// by the sync_ui_util helper routines to allow the UI to properly display |
// an "authenticating..." status message instead of an auth error when we are |
// in the process of trying to update credentials. |
// TODO(atwilson): This state should reside up in the UI or in a profile- |
// specific SyncUIUtil object rather than in ProfileSyncService. |
virtual bool UIShouldDepictAuthInProgress() const; |
tim (not reviewing)
2012/02/14 02:11:21
do we still need this if we now have AuthInProgres
Andrew T Wilson (Slow)
2012/02/14 05:23:52
Done, updated todo.
|
- virtual void SetUIShouldDepictAuthInProgress(bool auth_in_progress); |
// Returns true if OnPassphraseRequired has been called for any reason. |
virtual bool IsPassphraseRequired() const; |
@@ -515,6 +514,8 @@ class ProfileSyncService : public browser_sync::SyncFrontend, |
return configure_status_; |
} |
+ bool waiting_for_auth() const { return is_auth_in_progress_; } |
tim (not reviewing)
2012/02/14 02:11:21
why do we need this?
Andrew T Wilson (Slow)
2012/02/14 05:23:52
Now that ProfileSyncService isn't explicitly drivi
|
+ |
// ProfileKeyedService implementation. |
virtual void Shutdown() OVERRIDE; |
@@ -614,13 +615,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend, |
// want to startup once more. |
virtual void ReconfigureDatatypeManager(); |
- |
- // Time at which we begin an attempt a GAIA authorization. |
- base::TimeTicks auth_start_time_; |
- |
- // Time at which error UI is presented for the new tab page. |
- base::TimeTicks auth_error_time_; |
- |
// Factory used to create various dependent objects. |
scoped_ptr<ProfileSyncComponentsFactory> factory_; |
@@ -645,10 +639,8 @@ class ProfileSyncService : public browser_sync::SyncFrontend, |
// Whether the SyncBackendHost has been initialized. |
bool backend_initialized_; |
- // Various pieces of UI query this value to determine if they should show |
- // an "Authenticating.." type of message. We are the only central place |
- // all auth attempts funnel through, so it makes sense to provide this. |
- // As its name suggests, this should NOT be used for anything other than UI. |
+ // Set to true if a signin has completed but we're still waiting for the |
+ // backend to refresh its credentials. |
bool is_auth_in_progress_; |
SyncSetupWizard wizard_; |