chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc - Issue 608283003: Remove retail mode.

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/session_state_controller_delegate_chromeos.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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/policy/proto/chrome_device_policy.proto ('k') | chrome/browser/chromeos/settings/device_settings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 1a88476a2660a52e5a2fb7b2b127f37da6e68764..a4cc4bde7812cbe2939eded1be37488b5f73dc17 100644

--- a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc

+++ b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc

@@ -5,8 +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"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/power_manager_client.h"

#include "chromeos/dbus/session_manager_client.h"

@@ -14,14 +12,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();