Fix device policy recovery on CrOS login

chromeos/login/login_state.h

 // 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.
 
 #ifndef CHROMEOS_LOGIN_LOGIN_STATE_H_
 #define CHROMEOS_LOGIN_LOGIN_STATE_H_
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 
 // Tracks the login state of chrome, accessible to Ash and other chromeos code.
 class CHROMEOS_EXPORT LoginState {
  public:
   enum LoggedInState {
-    LOGGED_IN_OOBE,    // Out of box experience not completed
-    LOGGED_IN_NONE,    // Not logged in
-    LOGGED_IN_ACTIVE   // A user has logged in
+    LOGGED_IN_OOBE,       // Out of box experience not completed
+    LOGGED_IN_NONE,       // Not logged in
+    LOGGED_IN_SAFE_MODE,  // Not logged in and login not allowed for non-owners
+    LOGGED_IN_ACTIVE      // A user has logged in
   };
 
   enum LoggedInUserType {
     LOGGED_IN_USER_NONE,             // User is not logged in
     LOGGED_IN_USER_REGULAR,          // A regular user is logged in
     LOGGED_IN_USER_OWNER,            // The owner of the device is logged in
     LOGGED_IN_USER_GUEST,            // A guest is logged in (i.e. incognito)
     LOGGED_IN_USER_RETAIL_MODE,      // Is in retail mode
     LOGGED_IN_USER_PUBLIC_ACCOUNT,   // A public account is logged in
     LOGGED_IN_USER_LOCALLY_MANAGED,  // A locally managed user is logged in
     LOGGED_IN_USER_KIOSK_APP         // Is in kiosk app mode
   };
 
   class Observer {
    public:
     // Called when the login state changes.
-    virtual void LoggedInStateChanged(LoggedInState state) = 0;
+    virtual void LoggedInStateChanged() = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
   // Manage singleton instance.
   static void Initialize();
   static void Shutdown();
   static LoginState* Get();
   static bool IsInitialized();
 
   // Add/remove observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Set the logged in state and user type.
   void SetLoggedInState(LoggedInState state, LoggedInUserType type);
 
-  // Get the logged in state / user type.
-  LoggedInState GetLoggedInState() const;
+  // Get the logged in user type.
   LoggedInUserType GetLoggedInUserType() const;
 
-  // Returns true if |logged_in_state_| is active.
+  // Returns true if an user is considered to be logged in.

[stevenjb, 2013/09/12 00:48:01]

nit: 'a user' (English sucks)

[tbarzic, 2013/09/12 01:18:12]

:)

   bool IsUserLoggedIn() const;
 
+  // Returns true if |logged_in_state_| is safe mode (i.e. the user is not yet
+  // logged in, and only the owner will be allowed to log in).
+  bool IsInSafeMode() const;
+
   // Returns true if logged in and is a guest, retail, public, or kiosk user.
   bool IsGuestUser() const;
 
   // Returns true if the user is an authenticated user (i.e. non public account)
   bool IsUserAuthenticated() const;
 
   // Returns true if the user is authenticated by logging into Google account
   // (i.e., non public nor locally managed account).
   bool IsUserGaiaAuthenticated() const;
 
  private:
   LoginState();
   virtual ~LoginState();
 
   void NotifyObservers();
 
   LoggedInState logged_in_state_;
   LoggedInUserType logged_in_user_type_;
   ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_LOGIN_LOGIN_STATE_H_