Fix device policy recovery on CrOS login

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 444 matching lines @@
       policy_manager->core()->store()->RemoveObserver(this);
   }
 
   // Overridden from ash::SystemTrayDelegate:
   virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
     // In case of OOBE / sign in screen tray will be shown later.
     return LoginState::Get()->IsUserLoggedIn();
   }
 
   virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE {
-    // Map ChromeOS specific LOGGED_IN states to Ash LOGGED_IN states.
-    LoginState::LoggedInState state = LoginState::Get()->GetLoggedInState();
-    if (state == LoginState::LOGGED_IN_OOBE ||
-        state == LoginState::LOGGED_IN_NONE) {
+    // All non-logged in ChromeOS specific LOGGED_IN states map to the same
+    // Ash specific LOGGED_IN state.
+    if (!LoginState::Get()->IsUserLoggedIn())
       return ash::user::LOGGED_IN_NONE;
-    }
+
     if (screen_locked_)
       return ash::user::LOGGED_IN_LOCKED;
 
     LoginState::LoggedInUserType user_type =
         LoginState::Get()->GetLoggedInUserType();
     switch (user_type) {
       case LoginState::LOGGED_IN_USER_NONE:
         return ash::user::LOGGED_IN_NONE;
       case LoginState::LOGGED_IN_USER_REGULAR:
         return ash::user::LOGGED_IN_USER;
       case LoginState::LOGGED_IN_USER_OWNER:
         return ash::user::LOGGED_IN_OWNER;
       case LoginState::LOGGED_IN_USER_GUEST:
         return ash::user::LOGGED_IN_GUEST;
       case LoginState::LOGGED_IN_USER_RETAIL_MODE:
         return ash::user::LOGGED_IN_RETAIL_MODE;
       case LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT:
         return ash::user::LOGGED_IN_PUBLIC;
       case LoginState::LOGGED_IN_USER_LOCALLY_MANAGED:
         return ash::user::LOGGED_IN_LOCALLY_MANAGED;
       case LoginState::LOGGED_IN_USER_KIOSK_APP:
         return ash::user::LOGGED_IN_KIOSK_APP;
     }
     NOTREACHED();
     return ash::user::LOGGED_IN_NONE;
   }
 
   virtual bool IsOobeCompleted() const OVERRIDE {
     if (!base::chromeos::IsRunningOnChromeOS() &&
-        LoginState::Get()->GetLoggedInState() == LoginState::LOGGED_IN_ACTIVE)
+        LoginState::Get()->IsUserLoggedIn())
       return true;
     return StartupUtils::IsOobeCompleted();
   }
 
   virtual void ChangeProfilePicture() OVERRIDE {
     content::RecordAction(
         content::UserMetricsAction("OpenChangeProfilePictureDialog"));
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(),
                                 chrome::kChangeProfilePictureSubPage);
   }
@@ skipping 814 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos