diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 10:22:59 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 12:17:14 +0000 |
| commit | 69b8f9169ffd66fdeca1ac60a4bc06b91d106186 (patch) | |
| tree | c8b7f735583d0b4e0c0b61a014a7f4b3b26e85ab /chromium/chrome/browser/resources/gaia_auth_host/authenticator.js | |
| parent | daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (diff) | |
BASELINE: Update Chromium to 63.0.3239.87
Change-Id: Iac27464730121b4fac76869d87d622504642e016
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/chrome/browser/resources/gaia_auth_host/authenticator.js')
| -rw-r--r-- | chromium/chrome/browser/resources/gaia_auth_host/authenticator.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chromium/chrome/browser/resources/gaia_auth_host/authenticator.js b/chromium/chrome/browser/resources/gaia_auth_host/authenticator.js index 4d1bc38391f..fa1e41103f4 100644 --- a/chromium/chrome/browser/resources/gaia_auth_host/authenticator.js +++ b/chromium/chrome/browser/resources/gaia_auth_host/authenticator.js @@ -91,6 +91,9 @@ cr.define('cr.login', function() { 'menuGuestMode', // Enables "Guest mode" menu item 'menuKeyboardOptions', // Enables "Keyboard options" menu item 'menuEnterpriseEnrollment', // Enables "Enterprise enrollment" menu item. + 'lsbReleaseBoard', // Chrome OS Release board name + 'isFirstUser', // True if this is non-enterprise device, + // and there are no users yet. // The email fields allow for the following possibilities: // @@ -328,6 +331,11 @@ cr.define('cr.login', function() { mi += 'ee,'; if (mi.length) url = appendParam(url, 'mi', mi); + + if (data.lsbReleaseBoard) + url = appendParam(url, 'chromeos_board', data.lsbReleaseBoard); + if (data.isFirstUser) + url = appendParam(url, 'is_first_user', true); } } else { url = appendParam(url, 'continue', this.continueUrl_); @@ -428,8 +436,10 @@ cr.define('cr.login', function() { * @private */ Authenticator.prototype.onFocus_ = function(e) { - if (this.authMode == AuthMode.DESKTOP) + if (this.authMode == AuthMode.DESKTOP && + document.activeElement == document.body) { this.webview_.focus(); + } }; /** |