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

Unified Diff: components/user_manager/fake_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
« no previous file with comments | « components/user_manager/DEPS ('k') | components/user_manager/user_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/user_manager/fake_user_manager.cc
diff --git a/components/user_manager/fake_user_manager.cc b/components/user_manager/fake_user_manager.cc
index f924f494b7cebf9ff5318b1aa55f4bd580ec532f..73cde6f5bdd4daad7d760c7987de16d6e66006ab 100644
--- a/components/user_manager/fake_user_manager.cc
+++ b/components/user_manager/fake_user_manager.cc
@@ -9,7 +9,7 @@
#include "base/sys_info.h"
#include "base/task_runner.h"
#include "chromeos/chromeos_switches.h"
-#include "chromeos/login/user_names.h"
+#include "components/user_manager/user_names.h"
#include "components/user_manager/user_type.h"
namespace {
@@ -282,7 +282,7 @@ bool FakeUserManager::IsEnterpriseManaged() const {
}
bool FakeUserManager::IsDemoApp(const AccountId& account_id) const {
- return account_id == chromeos::login::DemoAccountId();
+ return account_id == DemoAccountId();
}
bool FakeUserManager::IsDeviceLocalAccountMarkedForRemoval(
@@ -297,20 +297,20 @@ void FakeUserManager::UpdateLoginState(const user_manager::User* active_user,
bool FakeUserManager::GetPlatformKnownUserId(const std::string& user_email,
const std::string& gaia_id,
AccountId* out_account_id) const {
- if (user_email == chromeos::login::kStubUser) {
- *out_account_id = chromeos::login::StubAccountId();
+ if (user_email == kStubUser) {
+ *out_account_id = StubAccountId();
return true;
}
- if (user_email == chromeos::login::kGuestUserName) {
- *out_account_id = chromeos::login::GuestAccountId();
+ if (user_email == kGuestUserName) {
+ *out_account_id = GuestAccountId();
return true;
}
return false;
}
const AccountId& FakeUserManager::GetGuestAccountId() const {
- return chromeos::login::GuestAccountId();
+ return GuestAccountId();
}
bool FakeUserManager::IsFirstExecAfterBoot() const {
@@ -323,11 +323,11 @@ void FakeUserManager::AsyncRemoveCryptohome(const AccountId& account_id) const {
}
bool FakeUserManager::IsGuestAccountId(const AccountId& account_id) const {
- return account_id == chromeos::login::GuestAccountId();
+ return account_id == GuestAccountId();
}
bool FakeUserManager::IsStubAccountId(const AccountId& account_id) const {
- return account_id == chromeos::login::StubAccountId();
+ return account_id == StubAccountId();
}
bool FakeUserManager::IsSupervisedAccountId(const AccountId& account_id) const {
« no previous file with comments | « components/user_manager/DEPS ('k') | components/user_manager/user_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698