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

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: 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: 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 04164dbe074e2696c086424a46957532b6ecc349..10e0d26dcdd93b2fbd81da0b71957e6938de99cb 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 {
@@ -286,7 +286,7 @@ bool FakeUserManager::IsEnterpriseManaged() const {
}
bool FakeUserManager::IsDemoApp(const AccountId& account_id) const {
- return account_id == chromeos::login::DemoAccountId();
+ return account_id == chromeos::DemoAccountId();
}
bool FakeUserManager::IsDeviceLocalAccountMarkedForRemoval(
@@ -301,25 +301,25 @@ 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 == chromeos::kStubUser) {
+ *out_account_id = chromeos::StubAccountId();
return true;
}
- if (user_email == chromeos::login::kGuestUserName) {
- *out_account_id = chromeos::login::GuestAccountId();
+ if (user_email == chromeos::kGuestUserName) {
+ *out_account_id = chromeos::GuestAccountId();
return true;
}
return false;
}
const AccountId& FakeUserManager::GetGuestAccountId() const {
- return chromeos::login::GuestAccountId();
+ return chromeos::GuestAccountId();
}
bool FakeUserManager::IsFirstExecAfterBoot() const {
return base::CommandLine::ForCurrentProcess()->HasSwitch(
- chromeos::switches::kFirstExecAfterBoot);
+ ::chromeos::switches::kFirstExecAfterBoot);
}
void FakeUserManager::AsyncRemoveCryptohome(const AccountId& account_id) const {
@@ -327,11 +327,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 == chromeos::GuestAccountId();
}
bool FakeUserManager::IsStubAccountId(const AccountId& account_id) const {
- return account_id == chromeos::login::StubAccountId();
+ return account_id == chromeos::StubAccountId();
}
bool FakeUserManager::IsSupervisedAccountId(const AccountId& account_id) const {
@@ -341,7 +341,7 @@ bool FakeUserManager::IsSupervisedAccountId(const AccountId& account_id) const {
bool FakeUserManager::HasBrowserRestarted() const {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
return base::SysInfo::IsRunningOnChromeOS() &&
- command_line->HasSwitch(chromeos::switches::kLoginUser);
+ command_line->HasSwitch(::chromeos::switches::kLoginUser);
}
const gfx::ImageSkia& FakeUserManager::GetResourceImagekiaNamed(int id) const {

Powered by Google App Engine
This is Rietveld 408576698