Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Side by Side Diff: chrome/browser/chromeos/login/session/chrome_session_manager.cc

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h" 5 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 app_manager->IsAutoLaunchEnabled() && 59 app_manager->IsAutoLaunchEnabled() &&
60 KioskAppLaunchError::Get() == KioskAppLaunchError::NONE; 60 KioskAppLaunchError::Get() == KioskAppLaunchError::NONE;
61 } 61 }
62 62
63 // Starts kiosk app auto launch and shows the splash screen. 63 // Starts kiosk app auto launch and shows the splash screen.
64 void StartKioskSession() { 64 void StartKioskSession() {
65 // Kiosk app launcher starts with login state. 65 // Kiosk app launcher starts with login state.
66 session_manager::SessionManager::Get()->SetSessionState( 66 session_manager::SessionManager::Get()->SetSessionState(
67 session_manager::SessionState::LOGIN_PRIMARY); 67 session_manager::SessionState::LOGIN_PRIMARY);
68 68
69 ShowLoginWizard(chromeos::WizardController::kAppLaunchSplashScreenName); 69 ShowLoginWizard(chromeos::OobeScreen::SCREEN_APP_LAUNCH_SPLASH);
70 70
71 // Login screen is skipped but 'login-prompt-visible' signal is still needed. 71 // Login screen is skipped but 'login-prompt-visible' signal is still needed.
72 VLOG(1) << "Kiosk app auto launch >> login-prompt-visible"; 72 VLOG(1) << "Kiosk app auto launch >> login-prompt-visible";
73 DBusThreadManager::Get()->GetSessionManagerClient()->EmitLoginPromptVisible(); 73 DBusThreadManager::Get()->GetSessionManagerClient()->EmitLoginPromptVisible();
74 } 74 }
75 75
76 // Starts the login/oobe screen. 76 // Starts the login/oobe screen.
77 void StartLoginOobeSession() { 77 void StartLoginOobeSession() {
78 // State will be defined once out-of-box/login branching is complete. 78 // State will be defined once out-of-box/login branching is complete.
79 ShowLoginWizard(std::string()); 79 ShowLoginWizard(OobeScreen::SCREEN_UNKNOWN);
80 80
81 // Reset reboot after update flag when login screen is shown. 81 // Reset reboot after update flag when login screen is shown.
82 policy::BrowserPolicyConnectorChromeOS* connector = 82 policy::BrowserPolicyConnectorChromeOS* connector =
83 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 83 g_browser_process->platform_part()->browser_policy_connector_chromeos();
84 if (!connector->IsEnterpriseManaged()) { 84 if (!connector->IsEnterpriseManaged()) {
85 PrefService* local_state = g_browser_process->local_state(); 85 PrefService* local_state = g_browser_process->local_state();
86 local_state->ClearPref(prefs::kRebootAfterUpdate); 86 local_state->ClearPref(prefs::kRebootAfterUpdate);
87 } 87 }
88 } 88 }
89 89
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 const std::string& user_id_hash, 250 const std::string& user_id_hash,
251 bool browser_restart) { 251 bool browser_restart) {
252 BootTimesRecorder* btl = BootTimesRecorder::Get(); 252 BootTimesRecorder* btl = BootTimesRecorder::Get();
253 btl->AddLoginTimeMarker("UserLoggedIn-Start", false); 253 btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
254 session_manager::SessionManager::NotifyUserLoggedIn( 254 session_manager::SessionManager::NotifyUserLoggedIn(
255 user_account_id, user_id_hash, browser_restart); 255 user_account_id, user_id_hash, browser_restart);
256 btl->AddLoginTimeMarker("UserLoggedIn-End", false); 256 btl->AddLoginTimeMarker("UserLoggedIn-End", false);
257 } 257 }
258 258
259 } // namespace chromeos 259 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698