Index: chrome/browser/signin/signin_manager.h |
diff --git a/chrome/browser/signin/signin_manager.h b/chrome/browser/signin/signin_manager.h |
index 6bb7fd7cd84a3db028aaf99d1ec7eaf46e2aac5c..8b1affb4a8f0e93fb3dd7cd2f6779c4a982cda7b 100644 |
--- a/chrome/browser/signin/signin_manager.h |
+++ b/chrome/browser/signin/signin_manager.h |
@@ -36,6 +36,7 @@ class CookieSettings; |
class GaiaAuthFetcher; |
class Profile; |
class PrefService; |
+class SigninGlobalError; |
// Details for the Notification type GOOGLE_SIGNIN_SUCCESSFUL. |
// A listener might use this to make note of a username / password |
@@ -165,11 +166,23 @@ class SigninManager : public GaiaAuthConsumer, |
const content::NotificationSource& source, |
const content::NotificationDetails& details) OVERRIDE; |
+ SigninGlobalError* signin_global_error() { |
+ return signin_global_error_.get(); |
+ } |
+ |
+ // ProfileKeyedService implementation. |
+ virtual void Shutdown() OVERRIDE; |
+ |
protected: |
// Weak pointer to parent profile (protected so FakeSigninManager can access |
// it). |
Profile* profile_; |
+ // Used to show auth errors in the wrench menu. The SigninGlobalError is |
+ // different than most GlobalErrors in that its lifetime is controlled by |
+ // SigninManager (so we can expose a reference for use in the wrench menu). |
+ scoped_ptr<SigninGlobalError> signin_global_error_; |
+ |
private: |
enum SigninType { |
SIGNIN_TYPE_NONE, |
@@ -249,7 +262,7 @@ class SigninManager : public GaiaAuthConsumer, |
// not need to mint new ones. |
ClientOAuthResult temp_oauth_login_tokens_; |
- // The list of SigninDiagnosticObservers |
+ // The list of SigninDiagnosticObservers. |
ObserverList<signin_internals_util::SigninDiagnosticsObserver> |
signin_diagnostics_observers_; |