Add LoginState class to src/chromeos/login

chrome/browser/chromeos/power/power_button_observer.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/power/power_button_observer.h"
 
 #include "ash/shell.h"
+#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/power_button_controller.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
-#include "chrome/browser/chromeos/login/user.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 namespace {
 
 ash::user::LoginStatus GetCurrentLoginStatus() {
-  const UserManager* user_manager = UserManager::Get();
-  if (!user_manager->IsUserLoggedIn())
-    return ash::user::LOGGED_IN_NONE;
-  if (user_manager->IsCurrentUserOwner())
-    return ash::user::LOGGED_IN_OWNER;
-
-  switch (user_manager->GetLoggedInUser()->GetType()) {
-    case User::USER_TYPE_REGULAR:
-      return ash::user::LOGGED_IN_USER;
-    case User::USER_TYPE_GUEST:
-      return ash::user::LOGGED_IN_GUEST;
-    case User::USER_TYPE_RETAIL_MODE:
-      return ash::user::LOGGED_IN_RETAIL_MODE;
-    case User::USER_TYPE_PUBLIC_ACCOUNT:
-      return ash::user::LOGGED_IN_PUBLIC;
-    case User::USER_TYPE_LOCALLY_MANAGED:
-      return ash::user::LOGGED_IN_LOCALLY_MANAGED;
-    case User::USER_TYPE_KIOSK_APP:
-      return ash::user::LOGGED_IN_KIOSK_APP;
-  }
-
-  NOTREACHED();
-  return ash::user::LOGGED_IN_USER;
+  if (!ash::Shell::GetInstance()->system_tray_delegate())
+    return  ash::user::LOGGED_IN_NONE;

[bartfab (slow), 2013/04/08 15:18:36]

The double space after return is still there.

[stevenjb, 2013/04/09 15:12:26]

Done.

+  return ash::Shell::GetInstance()->system_tray_delegate()->
+      GetUserLoginStatus();
 }
 
 }  // namespace
 
 PowerButtonObserver::PowerButtonObserver() {
   ash::Shell::GetInstance()->session_state_controller()->
       SetDelegate(new SessionStateControllerDelegateChromeos);
 
   registrar_.Add(
       this,
@@ skipping 49 matching lines @@
     bool down, const base::TimeTicks& timestamp) {
   ash::Shell::GetInstance()->power_button_controller()->
       OnPowerButtonEvent(down, timestamp);
 }
 
 void PowerButtonObserver::LockScreen() {
   ash::Shell::GetInstance()->session_state_controller()->OnStartingLock();
 }
 
 }  // namespace chromeos