chrome/browser/chromeos/login/login_performer.cc - Issue 214463007: Merge 253627 "Properly handle failure modes in the wildcard logi..."

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

Issue 214463007: Merge 253627 "Properly handle failure modes in the wildcard logi..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/

Patch Set: Created 6 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/login_performer.h ('k') | chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- chrome/browser/chromeos/login/login_performer.cc (revision 259991)

+++ chrome/browser/chromeos/login/login_performer.cc (working copy)

@@ -23,7 +23,6 @@

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

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"

-#include "chrome/browser/chromeos/policy/wildcard_login_checker.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/common/pref_names.h"

@@ -358,8 +357,9 @@

user_context_.auth_code.clear();

}

-void LoginPerformer::OnlineWildcardLoginCheckCompleted(bool result) {

- if (result) {

+void LoginPerformer::OnlineWildcardLoginCheckCompleted(

+ policy::WildcardLoginChecker::Result result) {

+ if (result == policy::WildcardLoginChecker::RESULT_ALLOWED) {

StartLoginCompletion();

} else {

if (delegate_)