Commit 11af6a4e authored by Igor's avatar Igor Committed by Commit Bot

Disable ctrl+alt+h shortcut after the enrollment started

The moment the enrollment process started, switching to hangouts meet
or back is disallowed, to avoid getting wrong policies. In order to
enroll the device in hangouts for meet, the ctrl+alt+h shortcut should
be pressed after ctrl+alt+e in the enrollment process.

BUG=chromium:1040523
TEST=Manual tests on the device

Change-Id: I4a5f589ab278bf2c6f47c8640d833b02e785735f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014406
Commit-Queue: Igor <igorcov@chromium.org>
Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarIgor <igorcov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738140}
parent 8c16618a
...@@ -125,4 +125,6 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() { ...@@ -125,4 +125,6 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
chrome.send('oauthEnrollAdUnlockConfiguration', [unlock_password]); chrome.send('oauthEnrollAdUnlockConfiguration', [unlock_password]);
}, },
}; };
}, {
changeRequisitonProhibited: true,
}); });
...@@ -443,7 +443,7 @@ cr.define('cr.ui.login', function() { ...@@ -443,7 +443,7 @@ cr.define('cr.ui.login', function() {
if (this.isOobeUI()) if (this.isOobeUI())
this.showDeviceRequisitionPrompt_(); this.showDeviceRequisitionPrompt_();
} else if (name == ACCELERATOR_DEVICE_REQUISITION_REMORA) { } else if (name == ACCELERATOR_DEVICE_REQUISITION_REMORA) {
if (this.isOobeUI()) if (this.isOobeUI() && !attributes.changeRequisitonProhibited)
this.showDeviceRequisitionRemoraPrompt_( this.showDeviceRequisitionRemoraPrompt_(
'deviceRequisitionRemoraPromptText', 'remora'); 'deviceRequisitionRemoraPromptText', 'remora');
} else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) { } else if (name == ACCELERATOR_APP_LAUNCH_BAILOUT) {
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
* resetAllowed: (boolean|undefined), * resetAllowed: (boolean|undefined),
* startEnrollmentAllowed: (boolean|undefined), * startEnrollmentAllowed: (boolean|undefined),
* toggleKioskAllowed: (boolean|undefined), * toggleKioskAllowed: (boolean|undefined),
* changeRequisitonProhibited: (boolean|undefined),
* }} * }}
*/ */
var DisplayManagerScreenAttributes = {}; var DisplayManagerScreenAttributes = {};
...@@ -62,6 +63,12 @@ DisplayManagerScreenAttributes.startEnrollmentAllowed; ...@@ -62,6 +63,12 @@ DisplayManagerScreenAttributes.startEnrollmentAllowed;
*/ */
DisplayManagerScreenAttributes.toggleKioskAllowed; DisplayManagerScreenAttributes.toggleKioskAllowed;
/**
* True if "enroll hangouts meet" accelerator is prohibited.
* @type {boolean|undefined}
*/
DisplayManagerScreenAttributes.changeRequisitonProhibited;
/** /**
* Possible types of UI. * Possible types of UI.
* @enum {string} * @enum {string}
......
...@@ -144,7 +144,7 @@ cr.define('login', function() { ...@@ -144,7 +144,7 @@ cr.define('login', function() {
* @param {(function()|Object)} proto Prototype of object or function that * @param {(function()|Object)} proto Prototype of object or function that
* returns prototype. * returns prototype.
*/ */
createScreen: function(name, id, template) { createScreen: function(name, id, template, attributes) {
if (typeof template == 'function') if (typeof template == 'function')
template = template(); template = template();
...@@ -198,7 +198,7 @@ cr.define('login', function() { ...@@ -198,7 +198,7 @@ cr.define('login', function() {
screen.deferredInitialization = function() { screen.initialize(); } screen.deferredInitialization = function() { screen.initialize(); }
else else
screen.initialize(); screen.initialize();
Oobe.getInstance().registerScreen(screen); Oobe.getInstance().registerScreen(screen, attributes);
}; };
// See also c/b/r/chromeos/login/login_screen_behavior.js // See also c/b/r/chromeos/login/login_screen_behavior.js
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment