Add LoginState class to src/chromeos/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 71 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/dbus/system_clock_client.h"
 #include "chromeos/ime/xkeyboard.h"
+#include "chromeos/login/login_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "grit/ash_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ skipping 255 matching lines @@
     policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
         g_browser_process->browser_policy_connector()->
            GetDeviceCloudPolicyManager();
     if (policy_manager)
       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 UserManager::Get()->IsUserLoggedIn();
+    return LoginState::Get()->IsUserLoggedIn();
   }
 
   virtual const string16 GetUserDisplayName() const OVERRIDE {
     return UserManager::Get()->GetLoggedInUser()->GetDisplayName();
   }
 
   virtual const std::string GetUserEmail() const OVERRIDE {
     return UserManager::Get()->GetLoggedInUser()->display_email();
   }
 
   virtual const gfx::ImageSkia& GetUserImage() const OVERRIDE {
     return UserManager::Get()->GetLoggedInUser()->image();
   }
 
   virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE {
-    UserManager* manager = UserManager::Get();
-    // At new user image screen manager->IsUserLoggedIn() would return true
-    // but there's no browser session available yet so use SessionStarted().
-    if (!manager->IsSessionStarted())
-      return ash::user::LOGGED_IN_NONE;
-    if (screen_locked_)
-      return ash::user::LOGGED_IN_LOCKED;
-    if (manager->IsCurrentUserOwner())
-      return ash::user::LOGGED_IN_OWNER;
-    if (manager->IsLoggedInAsGuest())
-      return ash::user::LOGGED_IN_GUEST;
-    if (manager->IsLoggedInAsDemoUser())
-      return ash::user::LOGGED_IN_RETAIL_MODE;
-    if (manager->IsLoggedInAsPublicAccount())
-      return ash::user::LOGGED_IN_PUBLIC;
-    return ash::user::LOGGED_IN_USER;
+    LoginState::State state = LoginState::Get()->GetLoginState();

[bartfab (slow), 2013/04/05 13:16:33]

I really dislike this - two almost-identical enums getting mapped to each other
with some subtle differences (one knows about OOBE, the other does not) that are
very easy to miss and not explained or justified anywhere.

[stevenjb, 2013/04/05 18:17:15]

One of them is Ash-specific (which may be on Windows), the other is Chrome OS
specific. Ash does not know about OOBE; I will add a comment to that effect.

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

I don't see much reason to abstract away OOBE when very Chrome-OS-specific
things like retial mode, single-app-kiosk mode and public session are all passed
on to ash verbatim.

+    switch (state) {
+      case LoginState::LOGGED_IN_OOBE:
+      case LoginState::LOGGED_IN_NONE:
+        return ash::user::LOGGED_IN_NONE;
+      case LoginState::LOGGED_IN_LOCKED:
+        return ash::user::LOGGED_IN_LOCKED;
+      case LoginState::LOGGED_IN_USER:
+        return ash::user::LOGGED_IN_USER;
+      case LoginState::LOGGED_IN_OWNER:
+        return ash::user::LOGGED_IN_OWNER;
+      case LoginState::LOGGED_IN_GUEST:
+        return ash::user::LOGGED_IN_GUEST;
+      case LoginState::LOGGED_IN_RETAIL_MODE:
+        return ash::user::LOGGED_IN_RETAIL_MODE;
+      case LoginState::LOGGED_IN_KIOSK_APP:
+        return ash::user::LOGGED_IN_KIOSK_APP;
+      case LoginState::LOGGED_IN_PUBLIC:
+        return ash::user::LOGGED_IN_PUBLIC;
+    }
+    NOTREACHED();
+    return ash::user::LOGGED_IN_NONE;
   }
 
   virtual bool IsOobeCompleted() const OVERRIDE {
     return WizardController::IsOobeCompleted();
   }
 
   virtual void ChangeProfilePicture() OVERRIDE {
     content::RecordAction(
         content::UserMetricsAction("OpenChangeProfilePictureDialog"));
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(),
@@ skipping 1120 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos