| Index: chrome/browser/signin/signin_manager.h
|
| diff --git a/chrome/browser/signin/signin_manager.h b/chrome/browser/signin/signin_manager.h
|
| index 4d338efbeda5e006424492e23b126e462b4761ea..43a50254bbf99c26977e797f7d8f8bcc78bf4d84 100644
|
| --- a/chrome/browser/signin/signin_manager.h
|
| +++ b/chrome/browser/signin/signin_manager.h
|
| @@ -91,7 +91,7 @@ class SigninManager : public GaiaAuthConsumer,
|
| // If a user has previously established a username and SignOut has not been
|
| // called, this will return the username.
|
| // Otherwise, it will return an empty string.
|
| - const std::string& GetAuthenticatedUsername();
|
| + const std::string& GetAuthenticatedUsername() const;
|
|
|
| // Sets the user name. Note: |username| should be already authenticated as
|
| // this is a sticky operation (in contrast to StartSignIn).
|
| @@ -171,6 +171,10 @@ class SigninManager : public GaiaAuthConsumer,
|
| return signin_global_error_.get();
|
| }
|
|
|
| + const SigninGlobalError* signin_global_error() const {
|
| + return signin_global_error_.get();
|
| + }
|
| +
|
| // ProfileKeyedService implementation.
|
| virtual void Shutdown() OVERRIDE;
|
|
|
| @@ -273,7 +277,7 @@ class SigninManager : public GaiaAuthConsumer,
|
| ClientOAuthResult temp_oauth_login_tokens_;
|
|
|
| // The list of SigninDiagnosticObservers.
|
| - ObserverList<signin_internals_util::SigninDiagnosticsObserver>
|
| + ObserverList<signin_internals_util::SigninDiagnosticsObserver, true>
|
| signin_diagnostics_observers_;
|
|
|
| base::WeakPtrFactory<SigninManager> weak_pointer_factory_;
|
|
|