Fix device policy recovery on CrOS login

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/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 49 matching lines @@
 void LoginState::SetLoggedInState(LoggedInState state,
                                   LoggedInUserType 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::LoggedInState LoginState::GetLoggedInState() const {
-  if (AlwaysLoggedIn())
-    return LOGGED_IN_ACTIVE;
-  return logged_in_state_;
-}
-
 LoginState::LoggedInUserType LoginState::GetLoggedInUserType() const {
   return logged_in_user_type_;
 }
 
 bool LoginState::IsUserLoggedIn() const {
-  return GetLoggedInState() == LOGGED_IN_ACTIVE;
+  if (AlwaysLoggedIn())
+    return true;
+  return logged_in_state_ == LOGGED_IN_ACTIVE;
+}
+
+bool LoginState::IsInSafeMode() const {
+  DCHECK(!AlwaysLoggedIn() || logged_in_state_ != LOGGED_IN_SAFE_MODE);
+  return logged_in_state_ == LOGGED_IN_SAFE_MODE;
 }
 
 bool LoginState::IsGuestUser() const {
-  if (GetLoggedInState() != LOGGED_IN_ACTIVE)
+  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_LOCALLY_MANAGED:
     case LOGGED_IN_USER_KIOSK_APP:
       return false;
     case LOGGED_IN_USER_GUEST:
     case LOGGED_IN_USER_RETAIL_MODE:
@@ skipping 21 matching lines @@
 
 LoginState::LoginState() : logged_in_state_(LOGGED_IN_OOBE),
                            logged_in_user_type_(LOGGED_IN_USER_NONE) {
 }
 
 LoginState::~LoginState() {
 }
 
 void LoginState::NotifyObservers() {
   FOR_EACH_OBSERVER(LoginState::Observer, observer_list_,
-                    LoggedInStateChanged(GetLoggedInState()));
+                    LoggedInStateChanged());
 }
 
 }  // namespace chromeos