Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

Unified Diff: trunk/src/chrome/browser/chromeos/login/user.cc

Issue 137133007: Revert 246674 "Indicate which authentication flow was used in Us..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/chromeos/login/user.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/user.cc (revision 246711)
+++ trunk/src/chrome/browser/chromeos/login/user.cc (working copy)
@@ -108,7 +108,7 @@
DISALLOW_COPY_AND_ASSIGN(PublicAccountUser);
};
-UserContext::UserContext() : using_oauth(true), auth_flow(AUTH_FLOW_OFFLINE) {
+UserContext::UserContext() : using_oauth(true) {
}
UserContext::UserContext(const std::string& username,
@@ -117,8 +117,7 @@
: username(username),
password(password),
auth_code(auth_code),
- using_oauth(true),
- auth_flow(AUTH_FLOW_OFFLINE) {
+ using_oauth(true) {
}
UserContext::UserContext(const std::string& username,
@@ -129,22 +128,19 @@
password(password),
auth_code(auth_code),
username_hash(username_hash),
- using_oauth(true),
- auth_flow(AUTH_FLOW_OFFLINE) {
+ using_oauth(true) {
}
UserContext::UserContext(const std::string& username,
const std::string& password,
const std::string& auth_code,
const std::string& username_hash,
- bool using_oauth,
- AuthFlow auth_flow)
+ bool using_oauth)
: username(username),
password(password),
auth_code(auth_code),
username_hash(username_hash),
- using_oauth(using_oauth),
- auth_flow(auth_flow) {
+ using_oauth(using_oauth) {
}
UserContext::~UserContext() {
@@ -155,8 +151,7 @@
context.password == password &&
context.auth_code == auth_code &&
context.username_hash == username_hash &&
- context.using_oauth == using_oauth &&
- context.auth_flow == auth_flow;
+ context.using_oauth == using_oauth;
}
base::string16 User::GetDisplayName() const {
« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/user.h ('k') | trunk/src/chrome/browser/chromeos/login/user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698