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

Unified Diff: components/user_manager/user.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/user.cc
diff --git a/components/user_manager/user.cc b/components/user_manager/user.cc
index b57d1d0db7d8a1106b9c324b28cf13c09fbe458d..2d9875a6f056657dff7efe3f7470a5207a5d1aa2 100644
--- a/components/user_manager/user.cc
+++ b/components/user_manager/user.cc
@@ -96,18 +96,6 @@ class SupervisedUser : public User {
DISALLOW_COPY_AND_ASSIGN(SupervisedUser);
};
-class RetailModeUser : public User {
- public:
- RetailModeUser();
- virtual ~RetailModeUser();
-
- // Overridden from User:
- virtual UserType GetType() const OVERRIDE;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(RetailModeUser);
-};
-
class PublicAccountUser : public User {
public:
explicit PublicAccountUser(const std::string& email);
@@ -193,10 +181,6 @@ User* User::CreateSupervisedUser(const std::string& username) {
return new SupervisedUser(username);
}
-User* User::CreateRetailModeUser() {
- return new RetailModeUser;
-}
-
User* User::CreatePublicAccountUser(const std::string& email) {
return new PublicAccountUser(email);
}
@@ -301,17 +285,6 @@ bool SupervisedUser::IsSupervised() const {
return true;
}
-RetailModeUser::RetailModeUser() : User(chromeos::login::kRetailModeUserName) {
- set_display_email(std::string());
-}
-
-RetailModeUser::~RetailModeUser() {
-}
-
-UserType RetailModeUser::GetType() const {
- return user_manager::USER_TYPE_RETAIL_MODE;
-}
-
PublicAccountUser::PublicAccountUser(const std::string& email) : User(email) {
}
@@ -323,12 +296,11 @@ UserType PublicAccountUser::GetType() const {
}
bool User::has_gaia_account() const {
- COMPILE_ASSERT(user_manager::NUM_USER_TYPES == 6, num_user_types_unexpected);
+ COMPILE_ASSERT(user_manager::NUM_USER_TYPES == 5, num_user_types_unexpected);
switch (GetType()) {
case user_manager::USER_TYPE_REGULAR:
return true;
case user_manager::USER_TYPE_GUEST:
- case user_manager::USER_TYPE_RETAIL_MODE:
case user_manager::USER_TYPE_PUBLIC_ACCOUNT:
case user_manager::USER_TYPE_SUPERVISED:
case user_manager::USER_TYPE_KIOSK_APP:

Powered by Google App Engine
This is Rietveld 408576698