| Index: chromeos/login/auth/authenticator.h
|
| diff --git a/chromeos/login/auth/authenticator.h b/chromeos/login/auth/authenticator.h
|
| index d3fd5840f5d0f10cc8ad0711425163fab54dd24e..7ae29b042c2bb8f2693d622117e0ad272a892070 100644
|
| --- a/chromeos/login/auth/authenticator.h
|
| +++ b/chromeos/login/auth/authenticator.h
|
| @@ -13,7 +13,9 @@
|
| #include "chromeos/login/auth/auth_status_consumer.h"
|
| #include "google_apis/gaia/gaia_auth_consumer.h"
|
|
|
| -class Profile;
|
| +namespace content {
|
| +class BrowserContext;
|
| +}
|
|
|
| namespace chromeos {
|
|
|
| @@ -31,13 +33,13 @@ class CHROMEOS_EXPORT Authenticator
|
|
|
| // Given externally authenticated username and password (part of
|
| // |user_context|), this method attempts to complete authentication process.
|
| - virtual void CompleteLogin(Profile* profile,
|
| + virtual void CompleteLogin(content::BrowserContext* browser_context,
|
| const UserContext& user_context) = 0;
|
|
|
| // Given a user credentials in |user_context|,
|
| // this method attempts to authenticate to login.
|
| // Must be called on the UI thread.
|
| - virtual void AuthenticateToLogin(Profile* profile,
|
| + virtual void AuthenticateToLogin(content::BrowserContext* browser_context,
|
| const UserContext& user_context) = 0;
|
|
|
| // Given a user credentials in |user_context|, this method attempts to
|
| @@ -86,9 +88,11 @@ class CHROMEOS_EXPORT Authenticator
|
| // and create a new cryptohome.
|
| virtual void ResyncEncryptedData() = 0;
|
|
|
| - // Profile (usually off the record ) that was used to perform the last
|
| + // BrowserContext (usually off the record) that was used to perform the last
|
| // authentication process.
|
| - Profile* authentication_profile() { return authentication_profile_; }
|
| + content::BrowserContext* authentication_context() {
|
| + return authentication_context_;
|
| + }
|
|
|
| // Sets consumer explicitly.
|
| void SetConsumer(AuthStatusConsumer* consumer);
|
| @@ -97,7 +101,7 @@ class CHROMEOS_EXPORT Authenticator
|
| virtual ~Authenticator();
|
|
|
| AuthStatusConsumer* consumer_;
|
| - Profile* authentication_profile_;
|
| + content::BrowserContext* authentication_context_;
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<Authenticator>;
|
|
|