| Index: chrome/browser/signin/signin_manager.h
|
| diff --git a/chrome/browser/signin/signin_manager.h b/chrome/browser/signin/signin_manager.h
|
| index 607941f82fac76d07bb6d153e58c8eec80ee994c..918b1ef74b398c588b67f890b6540118adcac050 100644
|
| --- a/chrome/browser/signin/signin_manager.h
|
| +++ b/chrome/browser/signin/signin_manager.h
|
| @@ -184,9 +184,6 @@ class SigninManager : public SigninManagerBase,
|
| bool HasSigninProcess() const;
|
|
|
| protected:
|
| - // If user was signed in, load tokens from DB if available.
|
| - virtual void InitTokenService() OVERRIDE;
|
| -
|
| // Flag saying whether signing out is allowed.
|
| bool prohibit_signout_;
|
|
|
| @@ -203,6 +200,9 @@ class SigninManager : public SigninManagerBase,
|
| FRIEND_TEST_ALL_PREFIXES(SigninManagerTest, ProvideSecondFactorSuccess);
|
| FRIEND_TEST_ALL_PREFIXES(SigninManagerTest, ProvideSecondFactorFailure);
|
|
|
| + // If user was signed in, load tokens from DB if available.
|
| + void InitTokenService();
|
| +
|
| // Called to setup the transient signin data during one of the
|
| // StartSigninXXX methods. |type| indicates which of the methods is being
|
| // used to perform the signin while |username| and |password| identify the
|
|
|