| Index: chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc
|
| diff --git a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc b/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc
|
| index e7beb5a17f332cbb66ff6ca35f9037fabcefebd2..8cb5766b40a5604b83379eaf8fe8e367e5481e30 100644
|
| --- a/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc
|
| +++ b/chrome/browser/chromeos/login/session/login_oobe_session_manager_delegate.cc
|
| @@ -7,15 +7,10 @@
|
| #include "base/prefs/pref_service.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/browser_process_platform_part_chromeos.h"
|
| -#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
|
| #include "chrome/browser/chromeos/login/login_wizard.h"
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chrome/common/pref_names.h"
|
|
|
| -#if !defined(USE_ATHENA)
|
| -#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
|
| -#endif
|
| -
|
| namespace chromeos {
|
|
|
| LoginOobeSessionManagerDelegate::LoginOobeSessionManagerDelegate() {
|
| @@ -28,11 +23,6 @@ void LoginOobeSessionManagerDelegate::Start() {
|
| // State will be defined once out-of-box/login branching is complete.
|
| ShowLoginWizard(std::string());
|
|
|
| -#if !defined(USE_ATHENA)
|
| - if (KioskModeSettings::Get()->IsKioskModeEnabled())
|
| - InitializeKioskModeScreensaver();
|
| -#endif
|
| -
|
| // Reset reboot after update flag when login screen is shown.
|
| policy::BrowserPolicyConnectorChromeOS* connector =
|
| g_browser_process->platform_part()->browser_policy_connector_chromeos();
|
|
|