chrome/browser/chromeos/login/auth/parallel_authenticator.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

Unified Diff: chrome/browser/chromeos/login/auth/parallel_authenticator.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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/first_run/first_run.cc ('K') | « chrome/browser/chromeos/login/auth/mount_manager.cc ('k') | chrome/browser/chromeos/login/auth/parallel_authenticator_unittest.cc » ('j') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/auth/parallel_authenticator.cc

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

index 66495edef1e2d4dfce771a1bf3867b869a94b005..f9ca2d3cb2c84534a98e20526642722847c6fb84 100644

--- a/chrome/browser/chromeos/login/auth/parallel_authenticator.cc

+++ b/chrome/browser/chromeos/login/auth/parallel_authenticator.cc

@@ -11,7 +11,6 @@

#include "chrome/browser/chrome_notification_types.h"

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

#include "chrome/browser/chromeos/login/auth/authentication_notification_details.h"

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

#include "chrome/browser/chromeos/ownership/owner_settings_service.h"

#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"

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

@@ -25,6 +24,7 @@

#include "chromeos/login/auth/user_context.h"

#include "chromeos/login/login_state.h"

#include "chromeos/login/user_names.h"

+#include "components/user_manager/user_manager.h"

#include "components/user_manager/user_type.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

@@ -242,12 +242,13 @@ void ParallelAuthenticator::AuthenticateToLogin(

Profile* profile,

const UserContext& user_context) {

authentication_profile_ = profile;

- current_state_.reset(new AuthAttemptState(

- user_context,

- user_manager::USER_TYPE_REGULAR,

- false, // unlock

- false, // online_complete

- !UserManager::Get()->IsKnownUser(user_context.GetUserID())));

+ current_state_.reset(

+ new AuthAttemptState(user_context,

+ user_manager::USER_TYPE_REGULAR,

+ false, // unlock

+ false, // online_complete

+ !user_manager::UserManager::Get()->IsKnownUser(

+ user_context.GetUserID())));

// Reset the verified flag.

owner_is_verified_ = false;

@@ -261,12 +262,13 @@ void ParallelAuthenticator::AuthenticateToLogin(

void ParallelAuthenticator::CompleteLogin(Profile* profile,