Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1088)

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/signin/chrome_signin_client.cc ('k') | chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1afcbc9e128e45c78b357f083d75025b091eac08..fb013c1a6de8616709f93e33fe2754c46466df06 100644
--- a/chrome/browser/signin/easy_unlock_service.cc
+++ b/chrome/browser/signin/easy_unlock_service.cc
@@ -23,8 +23,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 {
@@ -88,7 +88,7 @@ void EasyUnlockService::LaunchSetup() {
bool EasyUnlockService::IsAllowed() {
#if defined(OS_CHROMEOS)
- if (chromeos::UserManager::Get()->IsLoggedInAsGuest())
+ if (user_manager::UserManager::Get()->IsLoggedInAsGuest())
return false;
if (!chromeos::ProfileHelper::IsPrimaryProfile(profile_))
« chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/signin/chrome_signin_client.cc ('k') | chrome/browser/signin/easy_unlock_service_browsertest_chromeos.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698