Remove retail mode.

components/user_manager/user_manager_base.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/user_manager/user_manager_base.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 163 matching lines @@
 
     // Reset the new user flag if the user already exists.
     SetIsCurrentUserNew(false);
     NotifyUserAddedToSession(user, true /* user switch pending */);
 
     return;
   }
 
   if (user_id == chromeos::login::kGuestUserName) {
     GuestUserLoggedIn();
-  } else if (user_id == chromeos::login::kRetailModeUserName) {
-    RetailModeUserLoggedIn();
   } else if (IsKioskApp(user_id)) {
     KioskAppLoggedIn(user_id);
   } else if (IsDemoApp(user_id)) {
     DemoAccountLoggedIn();
   } else {
     EnsureUsersLoaded();
 
     if (user && user->GetType() == USER_TYPE_PUBLIC_ACCOUNT) {
       PublicAccountUserLoggedIn(user);
     } else if ((user && user->GetType() == USER_TYPE_SUPERVISED) ||
@@ skipping 353 matching lines @@
 bool UserManagerBase::IsUserLoggedIn() const {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   return active_user_;
 }
 
 bool UserManagerBase::IsLoggedInAsRegularUser() const {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_REGULAR;
 }
 
-bool UserManagerBase::IsLoggedInAsDemoUser() const {
-  DCHECK(task_runner_->RunsTasksOnCurrentThread());
-  return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_RETAIL_MODE;
-}
-
 bool UserManagerBase::IsLoggedInAsPublicAccount() const {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   return IsUserLoggedIn() &&
          active_user_->GetType() == USER_TYPE_PUBLIC_ACCOUNT;
 }
 
 bool UserManagerBase::IsLoggedInAsGuest() const {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   return IsUserLoggedIn() && active_user_->GetType() == USER_TYPE_GUEST;
 }
@@ skipping 14 matching lines @@
          active_user_->email() == chromeos::login::kStubUser;
 }
 
 bool UserManagerBase::IsSessionStarted() const {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   return session_started_;
 }
 
 bool UserManagerBase::IsUserNonCryptohomeDataEphemeral(
     const std::string& user_id) const {
-  // Data belonging to the guest, retail mode and stub users is always
+  // Data belonging to the guest and stub users is always

[bartfab (slow), 2014/10/15 09:52:21]

Nit: The entire comment fits on one line now.

[rkc, 2014/11/20 21:06:34]

Done.

   // ephemeral.
   if (user_id == chromeos::login::kGuestUserName ||
-      user_id == chromeos::login::kRetailModeUserName ||
       user_id == chromeos::login::kStubUser) {
     return true;
   }
 
   // Data belonging to the owner, anyone found on the user list and obsolete
   // public accounts whose data has not been removed yet is not ephemeral.
   if (user_id == GetOwnerEmail() || UserExistsInList(user_id) ||
       IsPublicAccountMarkedForRemoval(user_id)) {
     return false;
   }
@@ skipping 354 matching lines @@
   logged_in_state = active_user_ ? chromeos::LoginState::LOGGED_IN_ACTIVE
                                  : chromeos::LoginState::LOGGED_IN_NONE;
 
   chromeos::LoginState::LoggedInUserType login_user_type;
   if (logged_in_state == chromeos::LoginState::LOGGED_IN_NONE)
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_NONE;
   else if (is_current_user_owner_)
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_OWNER;
   else if (active_user_->GetType() == USER_TYPE_GUEST)
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_GUEST;
-  else if (active_user_->GetType() == USER_TYPE_RETAIL_MODE)
-    login_user_type = chromeos::LoginState::LOGGED_IN_USER_RETAIL_MODE;
   else if (active_user_->GetType() == USER_TYPE_PUBLIC_ACCOUNT)
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT;
   else if (active_user_->GetType() == USER_TYPE_SUPERVISED)
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_SUPERVISED;
   else if (active_user_->GetType() == USER_TYPE_KIOSK_APP)
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_KIOSK_APP;
   else
     login_user_type = chromeos::LoginState::LOGGED_IN_USER_REGULAR;
 
   if (primary_user_) {
@@ skipping 66 matching lines @@
 }
 
 void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace user_manager