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

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

Issue 16002004: Added login screen mode for adding users into session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WebUI test fixed. Created 7 years, 7 months 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/header_bar.js
diff --git a/chrome/browser/resources/chromeos/login/header_bar.js b/chrome/browser/resources/chromeos/login/header_bar.js
index abffe5f782e3ff5f9f787c50d5084ba25aa4ca94..2ec8d33e6c322d1b46a2349a6b9ea84fe7fe542e 100644
--- a/chrome/browser/resources/chromeos/login/header_bar.js
+++ b/chrome/browser/resources/chromeos/login/header_bar.js
@@ -42,9 +42,11 @@ cr.define('login', function() {
this.handleGuestClick_);
$('sign-out-user-button').addEventListener('click',
this.handleSignoutClick_);
+ $('cancel-multiple-sign-in-button').addEventListener('click',
+ this.handleCancelMultipleSignInClick_);
if (loadTimeData.getBoolean('enableAppMode') &&
- loadTimeData.getString('screenType') == 'login') {
+ document.documentElement.getAttribute('screen') == 'login') {
login.AppsMenuButton.decorate($('show-apps-button'));
}
},
@@ -131,6 +133,15 @@ cr.define('login', function() {
},
/**
+ * Cancel user adding button handler.
+ * @private
+ */
+ handleCancelMultipleSignInClick_: function(e) {
+ chrome.send('cancelUserAdding');
+ e.stopPropagation();
+ },
+
+ /**
* If true then "Browse as Guest" button is shown.
* @type {boolean}
*/
@@ -195,6 +206,7 @@ cr.define('login', function() {
$('add-user-button').hidden && $('cancel-add-user-button').hidden;
$('apps-header-bar-item').hidden = !this.hasApps_ ||
(!gaiaIsActive && !accountPickerIsActive);
+ $('cancel-multiple-sign-in-item').hidden = !isMultiProfilesUI;
if (!$('apps-header-bar-item').hidden)
$('show-apps-button').didShow();
« no previous file with comments | « chrome/browser/resources/chromeos/login/header_bar.html ('k') | chrome/browser/resources/chromeos/login/login.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698