Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2192)

Unified Diff: chrome/browser/sync/profile_sync_service.h

Issue 9295044: Start moving signin code out of browser/sync. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up unnecessary inclusions of signin_manager.h Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/signin_manager.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e9f4e167500d9067ec7d3d5f3af799f2fc7161de 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.
+ // TODO(atwilson): This state now resides in SigninManager - this method
+ // will be removed once we've cleaned up the callers. http://crbug.com/95269.
virtual bool UIShouldDepictAuthInProgress() const;
- virtual void SetUIShouldDepictAuthInProgress(bool auth_in_progress);
// Returns true if OnPassphraseRequired has been called for any reason.
virtual bool IsPassphraseRequired() const;
@@ -515,6 +514,13 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
return configure_status_;
}
+ // If true, the ProfileSyncService has detected that a new GAIA signin has
+ // succeeded, and is waiting for initialization to complete. This is used by
+ // the UI to differentiate between a new auth error (encountered as part of
+ // the initialization process) and a pre-existing auth error that just hasn't
+ // been cleared yet.
+ bool waiting_for_auth() const { return is_auth_in_progress_; }
+
// ProfileKeyedService implementation.
virtual void Shutdown() OVERRIDE;
@@ -614,13 +620,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 +644,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_;
« no previous file with comments | « chrome/browser/signin/signin_manager.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698