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

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

Issue 11672007: Fixed header bar UI behaviour. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Logging cleanup. Created 7 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/header_bar.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/display_manager.js
diff --git a/chrome/browser/resources/chromeos/login/display_manager.js b/chrome/browser/resources/chromeos/login/display_manager.js
index f003bbe120749698c95458cac31790ad375e3e68..a65d1cc920f8ca83fc25b029c958a05bf758b7a4 100644
--- a/chrome/browser/resources/chromeos/login/display_manager.js
+++ b/chrome/browser/resources/chromeos/login/display_manager.js
@@ -27,6 +27,13 @@
/* Help topic identifiers. */
/** @const */ var HELP_TOPIC_ENTERPRISE_REPORTING = 2535613;
+/* Signin UI state constants. Used to control header bar UI. */
+/** @const */ var SIGNIN_UI_STATE = {
+ HIDDEN: 0,
+ GAIA_SIGNIN: 1,
+ ACCOUNT_PICKER: 2
+};
+
cr.define('cr.ui.login', function() {
var Bubble = cr.ui.Bubble;
@@ -526,7 +533,11 @@ cr.define('cr.ui.login', function() {
* @param {string} opt_email An optional email for signin UI.
*/
DisplayManager.showSigninUI = function(opt_email) {
- $('login-header-bar').signinUIActive = true;
+ var currentScreenId = Oobe.getInstance().currentScreen.id;
+ if (currentScreenId == SCREEN_GAIA_SIGNIN)
+ $('login-header-bar').signinUIState = SIGNIN_UI_STATE.GAIA_SIGNIN;
+ else if (currentScreenId == SCREEN_ACCOUNT_PICKER)
+ $('login-header-bar').signinUIState = SIGNIN_UI_STATE.ACCOUNT_PICKER;
chrome.send('showAddUser', [opt_email]);
};
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/header_bar.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698