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

Unified Diff: chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)
Patch Set: Removed unused #includes Created 4 years, 2 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
Index: chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
index 88fb88413e8c4289ff418b34f654458bf805899b..0bf5be6668c6df059da32dc049857251fef3ca62 100644
--- a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
@@ -16,8 +16,8 @@
#include "chrome/grit/theme_resources.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/login/login_state.h"
-#include "chromeos/login/user_names.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 "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia.h"
@@ -229,7 +229,7 @@ bool FakeChromeUserManager::GetPlatformKnownUserId(
}
const AccountId& FakeChromeUserManager::GetGuestAccountId() const {
- return login::GuestAccountId();
+ return user_manager::GuestAccountId();
}
bool FakeChromeUserManager::IsFirstExecAfterBoot() const {
@@ -244,17 +244,17 @@ void FakeChromeUserManager::AsyncRemoveCryptohome(
bool FakeChromeUserManager::IsGuestAccountId(
const AccountId& account_id) const {
- return account_id == login::GuestAccountId();
+ return account_id == user_manager::GuestAccountId();
}
bool FakeChromeUserManager::IsStubAccountId(const AccountId& account_id) const {
- return account_id == login::StubAccountId();
+ return account_id == user_manager::StubAccountId();
}
bool FakeChromeUserManager::IsSupervisedAccountId(
const AccountId& account_id) const {
return gaia::ExtractDomainName(account_id.GetUserEmail()) ==
- chromeos::login::kSupervisedUserDomain;
+ user_manager::kSupervisedUserDomain;
}
bool FakeChromeUserManager::HasBrowserRestarted() const {

Powered by Google App Engine
This is Rietveld 408576698