Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1762)

Unified Diff: chrome/browser/resources/chromeos/login/screen_device_disabled.js

Issue 692383005: Add DeviceDisablingManager to manage device disabling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_3_425574_disable_header_bar
Patch Set: Add destructor required by clang. 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
Index: chrome/browser/resources/chromeos/login/screen_device_disabled.js
diff --git a/chrome/browser/resources/chromeos/login/screen_device_disabled.js b/chrome/browser/resources/chromeos/login/screen_device_disabled.js
index 3b0c1618e6f6c271897366adf2764ace978a0bfc..a1e10633dccd359dda3b60d1549a8a565beda5dc 100644
--- a/chrome/browser/resources/chromeos/login/screen_device_disabled.js
+++ b/chrome/browser/resources/chromeos/login/screen_device_disabled.js
@@ -13,6 +13,11 @@ login.createScreen('DeviceDisabledScreen', 'device-disabled', function() {
],
/**
+ * Ignore any accelerators the user presses on this screen.
+ */
+ ignoreAccelerators: true,
+
+ /**
* The visibility of the cancel button in the header bar is controlled by a
* global. Although the device disabling screen hides the button, a
* notification intended for an earlier screen (e.g animation finished)
@@ -40,6 +45,8 @@ login.createScreen('DeviceDisabledScreen', 'device-disabled', function() {
* @private
*/
setMessage: function(message) {
+ // The contents of |message| is untrusted. Set it as |textContent| so that
+ // it gets treated as plain text and cannot be used to inject JS or HTML.
$('device-disabled-message').textContent = message;
}
};
« no previous file with comments | « chrome/browser/chromeos/system/device_disabling_manager_unittest.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698