diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 15:37:28 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 15:37:28 +0000 |
| commit | 430aad7349448e1dcb01ec98bc2af63b68fa9f4a (patch) | |
| tree | 718652bceac39ec3ca193339f0e4ff3314bfde5e /chrome/browser/chromeos/power | |
| parent | 4e751edc35b3c89bfb6b2fc1dcea8b6ed5ff489d (diff) | |
| download | chromium_src-430aad7349448e1dcb01ec98bc2af63b68fa9f4a.zip chromium_src-430aad7349448e1dcb01ec98bc2af63b68fa9f4a.tar.gz chromium_src-430aad7349448e1dcb01ec98bc2af63b68fa9f4a.tar.bz2 | |
Integrate Kiosk Mode with enterprise policies.
Get and use the enterprise policies to set the various timeouts for kiosk mode.
R=mnissler@chromium.org,pastarmovj@chromium.org
BUG=chromium-os:27909
TEST=Not well tested yet, sent out for initial review.
Review URL: https://chromiumcodereview.appspot.com/9701084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/power')
| -rw-r--r-- | chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc b/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc index b894934..12ae439 100644 --- a/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc +++ b/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" #include "chrome/browser/chromeos/dbus/power_manager_client.h" -#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h" +#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" #include "chrome/browser/ui/browser_list.h" namespace chromeos { @@ -17,7 +17,7 @@ void PowerButtonControllerDelegateChromeos::RequestLockScreen() { // 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 (KioskModeHelper::IsKioskModeEnabled()) { + if (KioskModeSettings::Get()->IsKioskModeEnabled()) { BrowserList::AttemptUserExit(); return; } |