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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/header_bar.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview Display manager for WebUI OOBE and login. 6 * @fileoverview Display manager for WebUI OOBE and login.
7 */ 7 */
8 8
9 // TODO(xiyuan): Find a better to share those constants. 9 // TODO(xiyuan): Find a better to share those constants.
10 /** @const */ var SCREEN_OOBE_NETWORK = 'connect'; 10 /** @const */ var SCREEN_OOBE_NETWORK = 'connect';
11 /** @const */ var SCREEN_OOBE_EULA = 'eula'; 11 /** @const */ var SCREEN_OOBE_EULA = 'eula';
12 /** @const */ var SCREEN_OOBE_UPDATE = 'update'; 12 /** @const */ var SCREEN_OOBE_UPDATE = 'update';
13 /** @const */ var SCREEN_OOBE_ENROLLMENT = 'oauth-enrollment'; 13 /** @const */ var SCREEN_OOBE_ENROLLMENT = 'oauth-enrollment';
14 /** @const */ var SCREEN_GAIA_SIGNIN = 'gaia-signin'; 14 /** @const */ var SCREEN_GAIA_SIGNIN = 'gaia-signin';
15 /** @const */ var SCREEN_ACCOUNT_PICKER = 'account-picker'; 15 /** @const */ var SCREEN_ACCOUNT_PICKER = 'account-picker';
16 /** @const */ var SCREEN_ERROR_MESSAGE = 'error-message'; 16 /** @const */ var SCREEN_ERROR_MESSAGE = 'error-message';
17 /** @const */ var SCREEN_USER_IMAGE_PICKER = 'user-image'; 17 /** @const */ var SCREEN_USER_IMAGE_PICKER = 'user-image';
18 /** @const */ var SCREEN_TPM_ERROR = 'tpm-error-message'; 18 /** @const */ var SCREEN_TPM_ERROR = 'tpm-error-message';
19 /** @const */ var SCREEN_PASSWORD_CHANGED = 'password-changed'; 19 /** @const */ var SCREEN_PASSWORD_CHANGED = 'password-changed';
20 20
21 /* Accelerator identifiers. Must be kept in sync with webui_login_view.cc. */ 21 /* Accelerator identifiers. Must be kept in sync with webui_login_view.cc. */
22 /** @const */ var ACCELERATOR_CANCEL = 'cancel'; 22 /** @const */ var ACCELERATOR_CANCEL = 'cancel';
23 /** @const */ var ACCELERATOR_ENROLLMENT = 'enrollment'; 23 /** @const */ var ACCELERATOR_ENROLLMENT = 'enrollment';
24 /** @const */ var ACCELERATOR_VERSION = 'version'; 24 /** @const */ var ACCELERATOR_VERSION = 'version';
25 /** @const */ var ACCELERATOR_RESET = 'reset'; 25 /** @const */ var ACCELERATOR_RESET = 'reset';
26 26
27 /* Help topic identifiers. */ 27 /* Help topic identifiers. */
28 /** @const */ var HELP_TOPIC_ENTERPRISE_REPORTING = 2535613; 28 /** @const */ var HELP_TOPIC_ENTERPRISE_REPORTING = 2535613;
29 29
30 /* Signin UI state constants. Used to control header bar UI. */
31 /** @const */ var SIGNIN_UI_STATE = {
32 HIDDEN: 0,
33 GAIA_SIGNIN: 1,
34 ACCOUNT_PICKER: 2
35 };
36
30 cr.define('cr.ui.login', function() { 37 cr.define('cr.ui.login', function() {
31 var Bubble = cr.ui.Bubble; 38 var Bubble = cr.ui.Bubble;
32 39
33 /** 40 /**
34 * Groups of screens (screen IDs) that should have the same dimensions. 41 * Groups of screens (screen IDs) that should have the same dimensions.
35 * @type Array.<Array.<string>> 42 * @type Array.<Array.<string>>
36 * @const 43 * @const
37 */ 44 */
38 var SCREEN_GROUPS = [[SCREEN_OOBE_NETWORK, 45 var SCREEN_GROUPS = [[SCREEN_OOBE_NETWORK,
39 SCREEN_OOBE_EULA, 46 SCREEN_OOBE_EULA,
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 DisplayManager.disableSigninUI = function() { 526 DisplayManager.disableSigninUI = function() {
520 $('login-header-bar').disabled = true; 527 $('login-header-bar').disabled = true;
521 $('pod-row').disabled = true; 528 $('pod-row').disabled = true;
522 }; 529 };
523 530
524 /** 531 /**
525 * Shows signin UI. 532 * Shows signin UI.
526 * @param {string} opt_email An optional email for signin UI. 533 * @param {string} opt_email An optional email for signin UI.
527 */ 534 */
528 DisplayManager.showSigninUI = function(opt_email) { 535 DisplayManager.showSigninUI = function(opt_email) {
529 $('login-header-bar').signinUIActive = true; 536 var currentScreenId = Oobe.getInstance().currentScreen.id;
537 if (currentScreenId == SCREEN_GAIA_SIGNIN)
538 $('login-header-bar').signinUIState = SIGNIN_UI_STATE.GAIA_SIGNIN;
539 else if (currentScreenId == SCREEN_ACCOUNT_PICKER)
540 $('login-header-bar').signinUIState = SIGNIN_UI_STATE.ACCOUNT_PICKER;
530 chrome.send('showAddUser', [opt_email]); 541 chrome.send('showAddUser', [opt_email]);
531 }; 542 };
532 543
533 /** 544 /**
534 * Resets sign-in input fields. 545 * Resets sign-in input fields.
535 * @param {boolean} forceOnline Whether online sign-in should be forced. 546 * @param {boolean} forceOnline Whether online sign-in should be forced.
536 * If |forceOnline| is false previously used sign-in type will be used. 547 * If |forceOnline| is false previously used sign-in type will be used.
537 */ 548 */
538 DisplayManager.resetSigninUI = function(forceOnline) { 549 DisplayManager.resetSigninUI = function(forceOnline) {
539 var currentScreenId = Oobe.getInstance().currentScreen.id; 550 var currentScreenId = Oobe.getInstance().currentScreen.id;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 disable ? 'add' : 'remove']('button-restricted'); 649 disable ? 'add' : 'remove']('button-restricted');
639 $('add-user-button').title = disable ? 650 $('add-user-button').title = disable ?
640 localStrings.getString('disabledAddUserTooltip') : ''; 651 localStrings.getString('disabledAddUserTooltip') : '';
641 } 652 }
642 653
643 // Export 654 // Export
644 return { 655 return {
645 DisplayManager: DisplayManager 656 DisplayManager: DisplayManager
646 }; 657 };
647 }); 658 });
OLDNEW
« 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