Index: chrome/browser/chromeos/login/user.cc |
diff --git a/chrome/browser/chromeos/login/user.cc b/chrome/browser/chromeos/login/user.cc |
index c2df4bc38406ab3f908a75df9b8ac222578d21e8..fcf86c84f574488c7e04efcf1a01d98c2b0cff70 100644 |
--- a/chrome/browser/chromeos/login/user.cc |
+++ b/chrome/browser/chromeos/login/user.cc |
@@ -108,7 +108,7 @@ class PublicAccountUser : public User { |
DISALLOW_COPY_AND_ASSIGN(PublicAccountUser); |
}; |
-UserContext::UserContext() : using_oauth(true) { |
+UserContext::UserContext() : using_oauth(true), auth_flow(AUTH_FLOW_OFFLINE) { |
} |
UserContext::UserContext(const std::string& username, |
@@ -117,7 +117,8 @@ UserContext::UserContext(const std::string& username, |
: username(username), |
password(password), |
auth_code(auth_code), |
- using_oauth(true) { |
+ using_oauth(true), |
+ auth_flow(AUTH_FLOW_OFFLINE) { |
} |
UserContext::UserContext(const std::string& username, |
@@ -128,19 +129,22 @@ UserContext::UserContext(const std::string& username, |
password(password), |
auth_code(auth_code), |
username_hash(username_hash), |
- using_oauth(true) { |
+ using_oauth(true), |
+ auth_flow(AUTH_FLOW_OFFLINE) { |
} |
UserContext::UserContext(const std::string& username, |
const std::string& password, |
const std::string& auth_code, |
const std::string& username_hash, |
- bool using_oauth) |
+ bool using_oauth, |
+ AuthFlow auth_flow) |
: username(username), |
password(password), |
auth_code(auth_code), |
username_hash(username_hash), |
- using_oauth(using_oauth) { |
+ using_oauth(using_oauth), |
+ auth_flow(auth_flow) { |
} |
UserContext::~UserContext() { |
@@ -151,7 +155,8 @@ bool UserContext::operator==(const UserContext& context) const { |
context.password == password && |
context.auth_code == auth_code && |
context.username_hash == username_hash && |
- context.using_oauth == using_oauth; |
+ context.using_oauth == using_oauth && |
+ context.auth_flow == auth_flow; |
} |
base::string16 User::GetDisplayName() const { |