chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.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/ui/webui/chromeos/login/device_disabled_screen_handler.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: Rebased. 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

« chrome/browser/chromeos/system/device_disabling_manager_unittest.cc ('K') | « chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc

index 0ec8a0ce46e2a9133eebeaf1cbb42df7f0bb63f7..62a99d340234470ef215279af61abaac3f25c4ed 100644

--- a/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/device_disabled_screen_handler.cc

@@ -48,6 +48,12 @@ void DeviceDisabledScreenHandler::SetDelegate(Delegate* delegate) {

Initialize();

}

+void DeviceDisabledScreenHandler::UpdateMessage(const std::string& message) {

+ message_ = message;

+ if (page_is_ready())

+ CallJS("setMessage", message);

void DeviceDisabledScreenHandler::DeclareLocalizedValues(

LocalizedValuesBuilder* builder) {

builder->Add("deviceDisabledHeading", IDS_DEVICE_DISABLED_HEADING);