chrome/browser/chromeos/login/auth_attempt_state.cc - Issue 12704002: Support for auth code based authentication flow for both app and web UI driven flow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/auth_attempt_state.cc

Issue 12704002: Support for auth code based authentication flow for both app and web UI driven flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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

« no previous file with comments | « chrome/browser/chromeos/login/auth_attempt_state.h ('k') | chrome/browser/chromeos/login/authenticator.h » ('j') | chrome/browser/chromeos/login/existing_user_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/auth_attempt_state.cc

diff --git a/chrome/browser/chromeos/login/auth_attempt_state.cc b/chrome/browser/chromeos/login/auth_attempt_state.cc

index 4513af9b545733a176163c0389196fbd96cd6c7e..2366b196ba05e799178dc7260935099836c6ddbe 100644

--- a/chrome/browser/chromeos/login/auth_attempt_state.cc

+++ b/chrome/browser/chromeos/login/auth_attempt_state.cc

@@ -14,15 +14,13 @@ using content::BrowserThread;

namespace chromeos {

-AuthAttemptState::AuthAttemptState(const std::string& username,

- const std::string& password,

+AuthAttemptState::AuthAttemptState(const UserCredentials& credentials,

const std::string& ascii_hash,

const std::string& login_token,

const std::string& login_captcha,

const User::UserType user_type,

const bool user_is_new)

- : username(username),

- password(password),

+ : credentials(credentials),

ascii_hash(ascii_hash),

login_token(login_token),

login_captcha(login_captcha),

@@ -39,7 +37,7 @@ AuthAttemptState::AuthAttemptState(const std::string& username,

AuthAttemptState::AuthAttemptState(const std::string& username,

const std::string& ascii_hash)

- : username(username),

+ : credentials(username, "", ""),

ascii_hash(ascii_hash),

user_type(User::USER_TYPE_REGULAR),

unlock(true),

@@ -52,12 +50,10 @@ AuthAttemptState::AuthAttemptState(const std::string& username,

cryptohome_code_(cryptohome::MOUNT_ERROR_NONE) {

}

-AuthAttemptState::AuthAttemptState(const std::string& username,

- const std::string& password,

+AuthAttemptState::AuthAttemptState(const UserCredentials& credentials,

const std::string& ascii_hash,

const bool user_is_new)

- : username(username),

- password(password),

+ : credentials(credentials),

ascii_hash(ascii_hash),

user_type(User::USER_TYPE_REGULAR),

unlock(true),