Simplify LoginState methods.

chromeos/login/login_state.cc

 // Copyright (c) 2013 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 "chromeos/login/login_state.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 49 matching lines @@
 void LoginState::SetLoggedInStateAndPrimaryUser(
     LoggedInState state,
     LoggedInUserType type,
     const std::string& primary_user_hash) {
   DCHECK(type != LOGGED_IN_USER_NONE);
   primary_user_hash_ = primary_user_hash;
   VLOG(1) << "LoggedInStateUser: " << primary_user_hash;
   SetLoggedInState(state, type);
 }
 
-void LoginState::SetLoggedInState(LoggedInState state,
-                                  LoggedInUserType type) {
+void LoginState::SetLoggedInState(LoggedInState state, LoggedInUserType type) {
+  CHECK_NE(LOGGED_IN_USER_RETAIL_MODE, type);
   if (state == logged_in_state_ && type == logged_in_user_type_)
     return;
   VLOG(1) << "LoggedInState: " << state << " UserType: " << type;
   logged_in_state_ = state;
   logged_in_user_type_ = type;
   NotifyObservers();
 }
 
 LoginState::LoggedInUserType LoginState::GetLoggedInUserType() const {
   return logged_in_user_type_;
 }
 
 bool LoginState::IsUserLoggedIn() const {
   if (always_logged_in_)
     return true;
   return logged_in_state_ == LOGGED_IN_ACTIVE;
 }
 
 bool LoginState::IsInSafeMode() const {
   DCHECK(!always_logged_in_ || logged_in_state_ != LOGGED_IN_SAFE_MODE);
   return logged_in_state_ == LOGGED_IN_SAFE_MODE;
 }
 
-bool LoginState::IsGuestUser() const {
-  if (!IsUserLoggedIn())
-    return false;
-  switch (logged_in_user_type_) {
-    case LOGGED_IN_USER_NONE:
-    case LOGGED_IN_USER_REGULAR:
-    case LOGGED_IN_USER_OWNER:
-    case LOGGED_IN_USER_SUPERVISED:
-    case LOGGED_IN_USER_KIOSK_APP:
-      return false;
-    case LOGGED_IN_USER_GUEST:
-    case LOGGED_IN_USER_RETAIL_MODE:
-    case LOGGED_IN_USER_PUBLIC_ACCOUNT:
-      return true;
-  }
-  NOTREACHED();
-  return false;
+bool LoginState::IsGuestSessionUser() const {
+  return logged_in_user_type_ == LOGGED_IN_USER_GUEST;
+}
+
+bool LoginState::IsPublicSessionUser() const {
+  return logged_in_user_type_ == LOGGED_IN_USER_PUBLIC_ACCOUNT;
 }
 
 bool LoginState::IsKioskApp() const {
-  return logged_in_user_type_ == LoginState::LOGGED_IN_USER_KIOSK_APP;
+  return logged_in_user_type_ == LOGGED_IN_USER_KIOSK_APP;
 }
 
 bool LoginState::UserHasNetworkProfile() const {
   if (!IsUserLoggedIn())
     return false;
-  return logged_in_user_type_ != LOGGED_IN_USER_RETAIL_MODE &&
-         logged_in_user_type_ != LOGGED_IN_USER_PUBLIC_ACCOUNT;
+  return logged_in_user_type_ != LOGGED_IN_USER_PUBLIC_ACCOUNT;
 }
 
 bool LoginState::IsUserAuthenticated() const {
   return logged_in_user_type_ == LOGGED_IN_USER_REGULAR ||
          logged_in_user_type_ == LOGGED_IN_USER_OWNER ||
          logged_in_user_type_ == LOGGED_IN_USER_SUPERVISED;
 }
 
 bool LoginState::IsUserGaiaAuthenticated() const {
   return logged_in_user_type_ == LOGGED_IN_USER_REGULAR ||
          logged_in_user_type_ == LOGGED_IN_USER_OWNER;
 }
 
 // Private methods
 
 LoginState::LoginState() : logged_in_state_(LOGGED_IN_NONE),
                            logged_in_user_type_(LOGGED_IN_USER_NONE),
                            always_logged_in_(AlwaysLoggedInByDefault()) {
 }
 
 LoginState::~LoginState() {
 }
 
 void LoginState::NotifyObservers() {
   FOR_EACH_OBSERVER(LoginState::Observer, observer_list_,
                     LoggedInStateChanged());
 }
 
 }  // namespace chromeos