chrome/browser/signin/easy_unlock_service.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/signin/easy_unlock_service.cc

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

Patch Set: rebase 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:

Index: chrome/browser/signin/easy_unlock_service.cc

diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc

index 81d9f0e0d5a955e302f1289813659a7333448e91..10dbf203b36915879209a13ae146a544f2e0008d 100644

--- a/chrome/browser/signin/easy_unlock_service.cc

+++ b/chrome/browser/signin/easy_unlock_service.cc

@@ -25,8 +25,8 @@

#include "grit/browser_resources.h"

#if defined(OS_CHROMEOS)

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

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

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

#endif

namespace {

@@ -91,7 +91,7 @@ void EasyUnlockService::LaunchSetup() {

bool EasyUnlockService::IsAllowed() {

#if defined(OS_CHROMEOS)

- if (!chromeos::UserManager::Get()->IsLoggedInAsRegularUser())

+ if (!user_manager::UserManager::Get()->IsLoggedInAsRegularUser())

return false;

if (!chromeos::ProfileHelper::IsPrimaryProfile(profile_))