Chromium Code Reviews| Index: chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc |
| diff --git a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc |
| index 26c6988db3a7f5a22bcc63a050f942cb8b78df17..547b99a4006744b2c9af688d0a734602254419cd 100644 |
| --- a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc |
| +++ b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc |
| @@ -5,7 +5,6 @@ |
| #include "chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h" |
| #include "base/logging.h" |
| -#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| #include "chrome/browser/lifetime/application_lifetime.h" |
|
bartfab (slow)
2014/10/15 09:52:20
Nit: No longer used.
rkc
2014/11/20 21:06:34
Done.
|
| #include "chromeos/dbus/dbus_thread_manager.h" |
| #include "chromeos/dbus/power_manager_client.h" |
| @@ -14,14 +13,6 @@ |
| namespace chromeos { |
| void SessionStateControllerDelegateChromeos::RequestLockScreen() { |
| - // If KioskMode is enabled, if the user attempts to lock the screen via |
| - // the power button, we instead want to log the user out. This seemed to |
| - // be the most acceptable replacement for the lock action of the power |
| - // button for Kiosk mode users. |
| - if (KioskModeSettings::Get()->IsKioskModeEnabled()) { |
| - chrome::AttemptUserExit(); |
| - return; |
| - } |
| // TODO(antrim) : additional logging for crbug/173178 |
| LOG(WARNING) << "Requesting screen lock from SessionStateControllerDelegate"; |
| DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen(); |