Chromium Code Reviews| Index: chrome/browser/resources/user_chooser/header_bar.js |
| diff --git a/chrome/browser/resources/chromeos/login/header_bar.js b/chrome/browser/resources/user_chooser/header_bar.js |
| similarity index 67% |
| copy from chrome/browser/resources/chromeos/login/header_bar.js |
| copy to chrome/browser/resources/user_chooser/header_bar.js |
| index 2ec8d33e6c322d1b46a2349a6b9ea84fe7fe542e..ab2bdd9cafd868daba5ecfaef1b99bacbb1c002e 100644 |
| --- a/chrome/browser/resources/chromeos/login/header_bar.js |
| +++ b/chrome/browser/resources/user_chooser/header_bar.js |
| @@ -18,20 +18,16 @@ cr.define('login', function() { |
| __proto__: HTMLDivElement.prototype, |
| // Whether guest button should be shown when header bar is in normal mode. |
| - showGuest_: false, |
| + showGuest_: true, |
| // Current UI state of the sign-in screen. |
| - signinUIState_: SIGNIN_UI_STATE.HIDDEN, |
| + signinUIState_: SIGNIN_UI_STATE.ACCOUNT_PICKER, |
| // Whether to show kiosk apps menu. |
| hasApps_: false, |
| /** @override */ |
| decorate: function() { |
| - $('shutdown-header-bar-item').addEventListener('click', |
| - this.handleShutdownClick_); |
| - $('shutdown-button').addEventListener('click', |
| - this.handleShutdownClick_); |
| $('add-user-button').addEventListener('click', |
| this.handleAddUserClick_); |
| $('cancel-add-user-button').addEventListener('click', |
| @@ -42,13 +38,7 @@ cr.define('login', function() { |
| this.handleGuestClick_); |
| $('sign-out-user-button').addEventListener('click', |
|
Nikita (slow)
2013/06/11 18:22:16
You probably don't need sign out?
noms
2013/06/12 20:41:54
Done.
|
| this.handleSignoutClick_); |
| - $('cancel-multiple-sign-in-button').addEventListener('click', |
| - this.handleCancelMultipleSignInClick_); |
| - |
| - if (loadTimeData.getBoolean('enableAppMode') && |
| - document.documentElement.getAttribute('screen') == 'login') { |
| - login.AppsMenuButton.decorate($('show-apps-button')); |
| - } |
| + $('add-user-button').hidden = false; |
|
Nikita (slow)
2013/06/11 18:22:16
Call updateUI_() instead?
noms
2013/06/12 20:41:54
Done.
|
| }, |
| /** |
| @@ -78,7 +68,7 @@ cr.define('login', function() { |
| * @private |
| */ |
| handleAddUserClick_: function(e) { |
| - Oobe.showSigninUI(); |
| + chrome.send('addUser'); |
| // Prevent further propagation of click event. Otherwise, the click event |
| // handler of document object will set wallpaper to user's wallpaper when |
| // there is only one existing user. See http://crbug.com/166477 |
| @@ -97,8 +87,6 @@ cr.define('login', function() { |
| return; |
| } |
| - $('pod-row').loadLastWallpaper(); |
| - |
| Oobe.showScreen({id: SCREEN_ACCOUNT_PICKER}); |
| Oobe.resetSigninUI(true); |
| }, |
| @@ -108,8 +96,7 @@ cr.define('login', function() { |
| * @private |
| */ |
| handleGuestClick_: function(e) { |
| - Oobe.disableSigninUI(); |
| - chrome.send('launchIncognito'); |
| + chrome.send('launchGuest'); |
| e.stopPropagation(); |
| }, |
| @@ -124,24 +111,6 @@ cr.define('login', function() { |
| }, |
| /** |
| - * Shutdown button click handler. |
| - * @private |
| - */ |
| - handleShutdownClick_: function(e) { |
| - chrome.send('shutdownSystem'); |
| - e.stopPropagation(); |
| - }, |
| - |
| - /** |
| - * 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} |
| */ |
| @@ -183,33 +152,11 @@ cr.define('login', function() { |
| * @private |
| */ |
| updateUI_: function() { |
| - var gaiaIsActive = (this.signinUIState_ == SIGNIN_UI_STATE.GAIA_SIGNIN); |
| - var accountPickerIsActive = |
| - (this.signinUIState_ == SIGNIN_UI_STATE.ACCOUNT_PICKER); |
| - var managedUserCreationDialogIsActive = |
| - (this.signinUIState_ == SIGNIN_UI_STATE.MANAGED_USER_CREATION_FLOW); |
| - var wrongHWIDWarningIsActive = |
| - (this.signinUIState_ == SIGNIN_UI_STATE.WRONG_HWID_WARNING); |
| - var isMultiProfilesUI = Oobe.getInstance().isSignInToAddScreen(); |
| - |
| - $('add-user-button').hidden = !accountPickerIsActive || isMultiProfilesUI; |
| - $('cancel-add-user-button').hidden = accountPickerIsActive || |
| - !this.allowCancel_ || |
| - wrongHWIDWarningIsActive || |
| - isMultiProfilesUI; |
| - $('guest-user-header-bar-item').hidden = gaiaIsActive || |
| - managedUserCreationDialogIsActive || |
| - !this.showGuest_ || |
| - wrongHWIDWarningIsActive || |
| - isMultiProfilesUI; |
| - $('add-user-header-bar-item').hidden = |
| - $('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(); |
| + $('add-user-button').hidden = false; |
| + $('cancel-add-user-button').hidden = !this.allowCancel_; |
| + $('guest-user-header-bar-item').hidden = false; |
| + $('add-user-header-bar-item').hidden = false; |
| + $('apps-header-bar-item').hidden = true; |
| }, |
| /** |