| Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
|
| index 3478ab79b0f3c6ac866708b941c2000aef05e984..a40c30290ca8c29ddbd7709db13242e560bfa05d 100644
|
| --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
|
| @@ -60,7 +60,6 @@
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/cryptohome/async_method_caller.h"
|
| #include "chromeos/login/login_state.h"
|
| -#include "chromeos/login/user_names.h"
|
| #include "chromeos/settings/cros_settings_names.h"
|
| #include "chromeos/timezone/timezone_resolver.h"
|
| #include "components/policy/policy_constants.h"
|
| @@ -73,6 +72,7 @@
|
| #include "components/user_manager/remove_user_delegate.h"
|
| #include "components/user_manager/user.h"
|
| #include "components/user_manager/user_image/user_image.h"
|
| +#include "components/user_manager/user_names.h"
|
| #include "components/user_manager/user_type.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/notification_service.h"
|
| @@ -728,7 +728,7 @@ void ChromeUserManagerImpl::GuestUserLoggedIn() {
|
| user_manager::User::USER_IMAGE_INVALID, false);
|
|
|
| // Initializes wallpaper after active_user_ is set.
|
| - WallpaperManager::Get()->SetUserWallpaperNow(login::GuestAccountId());
|
| + WallpaperManager::Get()->SetUserWallpaperNow(user_manager::GuestAccountId());
|
| }
|
|
|
| void ChromeUserManagerImpl::RegularUserLoggedIn(const AccountId& account_id) {
|
| @@ -868,13 +868,14 @@ void ChromeUserManagerImpl::KioskAppLoggedIn(user_manager::User* user) {
|
|
|
| void ChromeUserManagerImpl::DemoAccountLoggedIn() {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| - active_user_ = user_manager::User::CreateKioskAppUser(login::DemoAccountId());
|
| + active_user_ =
|
| + user_manager::User::CreateKioskAppUser(user_manager::DemoAccountId());
|
| active_user_->SetStubImage(
|
| base::MakeUnique<user_manager::UserImage>(
|
| *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| IDR_PROFILE_PICTURE_LOADING)),
|
| user_manager::User::USER_IMAGE_INVALID, false);
|
| - WallpaperManager::Get()->SetUserWallpaperNow(login::DemoAccountId());
|
| + WallpaperManager::Get()->SetUserWallpaperNow(user_manager::DemoAccountId());
|
|
|
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| command_line->AppendSwitch(::switches::kForceAppMode);
|
| @@ -1253,7 +1254,7 @@ bool ChromeUserManagerImpl::GetPlatformKnownUserId(
|
| }
|
|
|
| const AccountId& ChromeUserManagerImpl::GetGuestAccountId() const {
|
| - return login::GuestAccountId();
|
| + return user_manager::GuestAccountId();
|
| }
|
|
|
| bool ChromeUserManagerImpl::IsFirstExecAfterBoot() const {
|
| @@ -1270,17 +1271,17 @@ void ChromeUserManagerImpl::AsyncRemoveCryptohome(
|
|
|
| bool ChromeUserManagerImpl::IsGuestAccountId(
|
| const AccountId& account_id) const {
|
| - return account_id == login::GuestAccountId();
|
| + return account_id == user_manager::GuestAccountId();
|
| }
|
|
|
| bool ChromeUserManagerImpl::IsStubAccountId(const AccountId& account_id) const {
|
| - return account_id == login::StubAccountId();
|
| + return account_id == user_manager::StubAccountId();
|
| }
|
|
|
| bool ChromeUserManagerImpl::IsSupervisedAccountId(
|
| const AccountId& account_id) const {
|
| return gaia::ExtractDomainName(account_id.GetUserEmail()) ==
|
| - chromeos::login::kSupervisedUserDomain;
|
| + user_manager::kSupervisedUserDomain;
|
| }
|
|
|
| bool ChromeUserManagerImpl::HasBrowserRestarted() const {
|
|
|