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

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 4 years 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 app_manager->IsAutoLaunchEnabled() && 52 app_manager->IsAutoLaunchEnabled() &&
53 KioskAppLaunchError::Get() == KioskAppLaunchError::NONE; 53 KioskAppLaunchError::Get() == KioskAppLaunchError::NONE;
54 } 54 }
55 55
56 // Starts kiosk app auto launch and shows the splash screen. 56 // Starts kiosk app auto launch and shows the splash screen.
57 void StartKioskSession() { 57 void StartKioskSession() {
58 // Kiosk app launcher starts with login state. 58 // Kiosk app launcher starts with login state.
59 session_manager::SessionManager::Get()->SetSessionState( 59 session_manager::SessionManager::Get()->SetSessionState(
60 session_manager::SessionState::LOGIN_PRIMARY); 60 session_manager::SessionState::LOGIN_PRIMARY);
61 61
62 ShowLoginWizard(chromeos::WizardController::kAppLaunchSplashScreenName); 62 ShowLoginWizard(chromeos::OobeScreen::SCREEN_APP_LAUNCH_SPLASH);
63 63
64 // Login screen is skipped but 'login-prompt-visible' signal is still needed. 64 // Login screen is skipped but 'login-prompt-visible' signal is still needed.
65 VLOG(1) << "Kiosk app auto launch >> login-prompt-visible"; 65 VLOG(1) << "Kiosk app auto launch >> login-prompt-visible";
66 DBusThreadManager::Get()->GetSessionManagerClient()->EmitLoginPromptVisible(); 66 DBusThreadManager::Get()->GetSessionManagerClient()->EmitLoginPromptVisible();
67 } 67 }
68 68
69 // Starts the login/oobe screen. 69 // Starts the login/oobe screen.
70 void StartLoginOobeSession() { 70 void StartLoginOobeSession() {
71 // State will be defined once out-of-box/login branching is complete. 71 // State will be defined once out-of-box/login branching is complete.
72 ShowLoginWizard(std::string()); 72 ShowLoginWizard(OobeScreen::SCREEN_UNKNOWN);
73 73
74 // Reset reboot after update flag when login screen is shown. 74 // Reset reboot after update flag when login screen is shown.
75 policy::BrowserPolicyConnectorChromeOS* connector = 75 policy::BrowserPolicyConnectorChromeOS* connector =
76 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 76 g_browser_process->platform_part()->browser_policy_connector_chromeos();
77 if (!connector->IsEnterpriseManaged()) { 77 if (!connector->IsEnterpriseManaged()) {
78 PrefService* local_state = g_browser_process->local_state(); 78 PrefService* local_state = g_browser_process->local_state();
79 local_state->ClearPref(prefs::kRebootAfterUpdate); 79 local_state->ClearPref(prefs::kRebootAfterUpdate);
80 } 80 }
81 } 81 }
82 82
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 const std::string& user_id_hash, 238 const std::string& user_id_hash,
239 bool browser_restart) { 239 bool browser_restart) {
240 BootTimesRecorder* btl = BootTimesRecorder::Get(); 240 BootTimesRecorder* btl = BootTimesRecorder::Get();
241 btl->AddLoginTimeMarker("UserLoggedIn-Start", false); 241 btl->AddLoginTimeMarker("UserLoggedIn-Start", false);
242 session_manager::SessionManager::NotifyUserLoggedIn( 242 session_manager::SessionManager::NotifyUserLoggedIn(
243 user_account_id, user_id_hash, browser_restart); 243 user_account_id, user_id_hash, browser_restart);
244 btl->AddLoginTimeMarker("UserLoggedIn-End", false); 244 btl->AddLoginTimeMarker("UserLoggedIn-End", false);
245 } 245 }
246 246
247 } // namespace chromeos 247 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698