chrome/browser/chromeos/login/existing_user_controller.cc - Issue 614973002: Extract LoginPerformer to chromeos/auth

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/existing_user_controller.cc

Issue 614973002: Extract LoginPerformer to chromeos/auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge Created 6 years, 2 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

« chrome/browser/chromeos/login/auth/chrome_login_performer.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller.h ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | chromeos/login/auth/login_performer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9b9342215f060a0623c9108b4234c2632c68a40a..be93365e5650bdc92000e91f7d3ceb0e8a6ec03d 100644

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

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

@@ -29,6 +29,7 @@

#include "chrome/browser/chromeos/customization_document.h"

#include "chrome/browser/chromeos/first_run/first_run.h"

#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"

+#include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"

#include "chrome/browser/chromeos/login/helper.h"

#include "chrome/browser/chromeos/login/login_utils.h"

#include "chrome/browser/chromeos/login/startup_utils.h"

@@ -459,7 +460,7 @@ void ExistingUserController::PerformLogin(

if (!login_performer_.get() || num_login_attempts_ <= 1) {

// Only one instance of LoginPerformer should exist at a time.

login_performer_.reset(NULL);

- login_performer_.reset(new LoginPerformer(this));

+ login_performer_.reset(new ChromeLoginPerformer(this));

}

is_login_in_progress_ = true;

@@ -484,7 +485,7 @@ void ExistingUserController::LoginAsRetailModeUser() {

// Only one instance of LoginPerformer should exist at a time.

login_performer_.reset(NULL);

- login_performer_.reset(new LoginPerformer(this));

+ login_performer_.reset(new ChromeLoginPerformer(this));

is_login_in_progress_ = true;

login_performer_->LoginRetailMode();

SendAccessibilityAlert(

@@ -539,7 +540,7 @@ void ExistingUserController::LoginAsGuest() {

// Only one instance of LoginPerformer should exist at a time.

login_performer_.reset(NULL);

- login_performer_.reset(new LoginPerformer(this));

+ login_performer_.reset(new ChromeLoginPerformer(this));

is_login_in_progress_ = true;

login_performer_->LoginOffTheRecord();

SendAccessibilityAlert(

@@ -1253,7 +1254,7 @@ void ExistingUserController::LoginAsPublicSessionInternal(

const UserContext& user_context) {

// Only one instance of LoginPerformer should exist at a time.

login_performer_.reset(NULL);

- login_performer_.reset(new LoginPerformer(this));

+ login_performer_.reset(new ChromeLoginPerformer(this));

is_login_in_progress_ = true;

login_performer_->LoginAsPublicSession(user_context);

SendAccessibilityAlert(