chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc - Issue 9701084: Integrate Kiosk Mode with enterprise policies.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc

Issue 9701084: Integrate Kiosk Mode with enterprise policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: yacf Created 8 years, 9 months 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/webui_login_display_host.cc ('k') | chrome/browser/chromeos/stub_cros_settings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc

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 b89493423fe84016ebf0ba37e5aa09cbb6d716f4..12ae4391e7a2f1111155fc99769f1c689e149395 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;

}