| OLD | NEW |
| 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/login_oobe_session_manager_deleg
ate.h" | 5 #include "chrome/browser/chromeos/login/session/login_oobe_session_manager_deleg
ate.h" |
| 6 | 6 |
| 7 #include "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 9 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
| 10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | |
| 11 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| 12 #include "chrome/browser/chromeos/login/login_wizard.h" | 11 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 13 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 12 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 14 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 15 | 14 |
| 15 #if !defined(USE_ATHENA) |
| 16 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
| 17 #endif |
| 18 |
| 16 namespace chromeos { | 19 namespace chromeos { |
| 17 | 20 |
| 18 LoginOobeSessionManagerDelegate::LoginOobeSessionManagerDelegate() { | 21 LoginOobeSessionManagerDelegate::LoginOobeSessionManagerDelegate() { |
| 19 } | 22 } |
| 20 | 23 |
| 21 LoginOobeSessionManagerDelegate::~LoginOobeSessionManagerDelegate() { | 24 LoginOobeSessionManagerDelegate::~LoginOobeSessionManagerDelegate() { |
| 22 } | 25 } |
| 23 | 26 |
| 24 void LoginOobeSessionManagerDelegate::Start() { | 27 void LoginOobeSessionManagerDelegate::Start() { |
| 25 // State will be defined once out-of-box/login branching is complete. | 28 // State will be defined once out-of-box/login branching is complete. |
| 26 ShowLoginWizard(std::string()); | 29 ShowLoginWizard(std::string()); |
| 27 | 30 |
| 31 #if !defined(USE_ATHENA) |
| 28 if (KioskModeSettings::Get()->IsKioskModeEnabled()) | 32 if (KioskModeSettings::Get()->IsKioskModeEnabled()) |
| 29 InitializeKioskModeScreensaver(); | 33 InitializeKioskModeScreensaver(); |
| 34 #endif |
| 30 | 35 |
| 31 // Reset reboot after update flag when login screen is shown. | 36 // Reset reboot after update flag when login screen is shown. |
| 32 policy::BrowserPolicyConnectorChromeOS* connector = | 37 policy::BrowserPolicyConnectorChromeOS* connector = |
| 33 g_browser_process->platform_part()->browser_policy_connector_chromeos(); | 38 g_browser_process->platform_part()->browser_policy_connector_chromeos(); |
| 34 if (!connector->IsEnterpriseManaged()) { | 39 if (!connector->IsEnterpriseManaged()) { |
| 35 PrefService* local_state = g_browser_process->local_state(); | 40 PrefService* local_state = g_browser_process->local_state(); |
| 36 local_state->ClearPref(prefs::kRebootAfterUpdate); | 41 local_state->ClearPref(prefs::kRebootAfterUpdate); |
| 37 } | 42 } |
| 38 } | 43 } |
| 39 | 44 |
| 40 } // namespace chromeos | 45 } // namespace chromeos |
| OLD | NEW |