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

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

Issue 11817045: Move auth-error reporting code out of SyncGlobalError and into SigninGlobalError (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android compilation fix Created 7 years, 11 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
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 feca8f77a05f9d71045feea43dc2b92dc5feacfb..8d873eb6626c4aaf72beddfa11dbefb30b681dce 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -21,6 +21,7 @@
#include "chrome/browser/api/sync/profile_sync_service_base.h"
#include "chrome/browser/api/sync/profile_sync_service_observer.h"
#include "chrome/browser/profiles/profile_keyed_service.h"
+#include "chrome/browser/signin/signin_global_error.h"
#include "chrome/browser/sync/backend_unrecoverable_error_handler.h"
#include "chrome/browser/sync/failed_datatypes_handler.h"
#include "chrome/browser/sync/glue/data_type_controller.h"
@@ -155,6 +156,7 @@ class ProfileSyncService : public ProfileSyncServiceBase,
public browser_sync::SyncFrontend,
public browser_sync::SyncPrefObserver,
public browser_sync::DataTypeManagerObserver,
+ public SigninGlobalError::AuthStatusProvider,
public syncer::UnrecoverableErrorHandler,
public content::NotificationObserver,
public ProfileKeyedService,
@@ -402,6 +404,9 @@ class ProfileSyncService : public ProfileSyncServiceBase,
// management. If so, the user is not allowed to configure sync.
bool IsManaged() const;
+ // SigninGlobalError::AuthStatusProvider implementation.
+ virtual GoogleServiceAuthError GetAuthStatus() const OVERRIDE;
tim (not reviewing) 2013/01/15 04:25:42 Hmm.. we have this and GetAuthError() on this clas
Andrew T Wilson (Slow) 2013/01/15 13:24:56 In general, I don't think that the existence of a
+
// syncer::UnrecoverableErrorHandler implementation.
virtual void OnUnrecoverableError(
const tracked_objects::Location& from_here,

Powered by Google App Engine
This is Rietveld 408576698