chrome/browser/chromeos/login/wizard_controller.cc - Issue 711433002: Enable device disabling during normal operation

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/login/wizard_controller.cc

Issue 711433002: Enable device disabling during normal operation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_4_425574_add_device_disabling_manager

Patch Set: Address one more comment I had missed. Created 6 years, 1 month 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/screens/mock_device_disabled_screen_actor.h ('k') | chrome/browser/chromeos/system/device_disabling_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/wizard_controller.cc

diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc

index 8253a2e3494e7c1e66f784c4a19cc0f3b742f95b..5d0ee9dc455f6912a6b2520a817ef6e22856541d 100644

--- a/chrome/browser/chromeos/login/wizard_controller.cc

+++ b/chrome/browser/chromeos/login/wizard_controller.cc

@@ -1119,6 +1119,15 @@ void WizardController::AutoLaunchKioskApp() {

return;

}

+ bool device_disabled = false;

+ CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled);

+ if (device_disabled && system::DeviceDisablingManager::

+ HonorDeviceDisablingDuringNormalOperation()) {

+ // If the device is disabled, bail out. A device disabled screen will be

+ // shown by the DeviceDisablingManager.

+ return;

+ }

host_->StartAppLaunch(app_id, false /* diagnostic_mode */);

}