Commit f4743db7 authored by tnagel@chromium.org's avatar tnagel@chromium.org

Remove unused LOGGED_IN_OOBE LoggedInState.

BUG=none

Review URL: https://codereview.chromium.org/371033005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282645 0039d316-1c4b-4281-b951-d872f2087c98
parent 633bdfa0
......@@ -1182,16 +1182,6 @@ void ShowLoginWizard(const std::string& first_screen_name) {
gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
// Check whether we need to execute OOBE process.
bool oobe_complete = chromeos::StartupUtils::IsOobeCompleted();
if (!oobe_complete) {
LoginState::Get()->SetLoggedInState(
LoginState::LOGGED_IN_OOBE, LoginState::LOGGED_IN_USER_NONE);
} else {
LoginState::Get()->SetLoggedInState(
LoginState::LOGGED_IN_NONE, LoginState::LOGGED_IN_USER_NONE);
}
LoginDisplayHost* display_host = new LoginDisplayHostImpl(screen_bounds);
bool show_app_launch_splash_screen = (first_screen_name ==
......@@ -1204,6 +1194,8 @@ void ShowLoginWizard(const std::string& first_screen_name) {
return;
}
// Check whether we need to execute OOBE process.
bool oobe_complete = chromeos::StartupUtils::IsOobeCompleted();
policy::BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos();
bool enrollment_screen_wanted =
......
......@@ -36,7 +36,7 @@ class LoginStateNotificationBlockerChromeOSTest
chromeos::LoginState::Shutdown();
}
// message_center::NotificationBlocker::Observer ovverrides:
// message_center::NotificationBlocker::Observer overrides:
virtual void OnBlockingStateChanged(
message_center::NotificationBlocker* blocker) OVERRIDE {
state_changed_count_++;
......@@ -70,7 +70,7 @@ TEST_F(LoginStateNotificationBlockerChromeOSTest, BaseTest) {
chromeos::LoginState::Get()->SetLoggedInState(
chromeos::LoginState::LOGGED_IN_NONE,
chromeos::LoginState::LOGGED_IN_USER_NONE);
EXPECT_EQ(1, GetStateChangedCountAndReset());
EXPECT_EQ(0, GetStateChangedCountAndReset());
EXPECT_FALSE(ShouldShowNotificationAsPopup(notifier_id));
// Logged in as a normal user.
......@@ -104,7 +104,7 @@ TEST_F(LoginStateNotificationBlockerChromeOSTest, AlwaysAllowedNotifier) {
chromeos::LoginState::Get()->SetLoggedInState(
chromeos::LoginState::LOGGED_IN_NONE,
chromeos::LoginState::LOGGED_IN_USER_NONE);
EXPECT_EQ(1, GetStateChangedCountAndReset());
EXPECT_EQ(0, GetStateChangedCountAndReset());
EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
// Logged in as a normal user.
......
......@@ -135,7 +135,7 @@ bool LoginState::IsUserGaiaAuthenticated() const {
// Private methods
LoginState::LoginState() : logged_in_state_(LOGGED_IN_OOBE),
LoginState::LoginState() : logged_in_state_(LOGGED_IN_NONE),
logged_in_user_type_(LOGGED_IN_USER_NONE),
always_logged_in_(AlwaysLoggedInByDefault()) {
}
......
......@@ -15,7 +15,6 @@ namespace chromeos {
class CHROMEOS_EXPORT LoginState {
public:
enum LoggedInState {
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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment