Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 /* Copyright 2016 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 */ | |
|
Dan Beam
2016/02/12 23:42:24
revert to single-line comments
Moe
2016/02/20 00:21:00
Done.
| |
| 5 | |
| 4 <include src="../../../../ui/login/screen.js"> | 6 <include src="../../../../ui/login/screen.js"> |
| 5 <include src="../../../../ui/login/bubble.js"> | 7 <include src="../../../../ui/login/bubble.js"> |
| 6 <include src="../../../../ui/login/login_ui_tools.js"> | 8 <include src="../../../../ui/login/login_ui_tools.js"> |
| 7 <include src="../../../../ui/login/display_manager.js"> | 9 <include src="../../../../ui/login/display_manager.js"> |
| 8 <include src="control_bar.js"> | |
| 9 <include src="../../../../ui/login/account_picker/screen_account_picker.js"> | 10 <include src="../../../../ui/login/account_picker/screen_account_picker.js"> |
| 10 <include src="../../../../ui/login/account_picker/user_pod_row.js"> | 11 <include src="../../../../ui/login/account_picker/user_pod_row.js"> |
| 11 <include src="../../../../ui/login/resource_loader.js"> | 12 <include src="../../../../ui/login/resource_loader.js"> |
| 12 <include src="user_manager_tutorial.js"> | 13 |
| 13 | 14 |
| 14 cr.define('cr.ui', function() { | 15 cr.define('cr.ui', function() { |
| 15 var DisplayManager = cr.ui.login.DisplayManager; | 16 var DisplayManager = cr.ui.login.DisplayManager; |
| 16 var UserManagerTutorial = cr.ui.login.UserManagerTutorial; | |
| 17 | 17 |
| 18 /** | 18 /** |
| 19 * Constructs an Out of box controller. It manages initialization of screens, | 19 * Constructs an Out of box controller. It manages initialization of screens, |
| 20 * transitions, error messages display. | 20 * transitions, error messages display. |
| 21 * @extends {DisplayManager} | 21 * @constructor |
| 22 * @constructor | 22 * @extends {DisplayManager} |
| 23 */ | 23 */ |
| 24 function Oobe() { | 24 function Oobe() {} |
|
Dan Beam
2016/02/12 23:42:24
why is this file named user_manager.js but the cla
Moe
2016/02/20 00:21:00
It looks like "user manager" was originally implem
| |
| 25 } | |
| 26 | 25 |
| 27 cr.addSingletonGetter(Oobe); | 26 cr.addSingletonGetter(Oobe); |
| 28 | 27 |
| 29 Oobe.prototype = { | 28 Oobe.prototype = { |
| 30 __proto__: DisplayManager.prototype, | 29 __proto__: DisplayManager.prototype, |
| 31 }; | 30 }; |
| 32 | 31 |
| 33 /** | 32 /** |
| 34 * Shows the given screen. | 33 * Shows the given screen. |
| 35 * @param {bool} showGuest Whether the 'Browse as Guest' button is displayed. | 34 * @param {boolean} showGuest True if |Browse as Guest| button should be |
| 36 * @param {bool} showAddPerson Whether the 'Add Person' button is displayed. | 35 * displayed. |
| 36 * @param {boolean} showAddPerson True if |Add Person| button should be | |
| 37 * displayed. | |
| 37 */ | 38 */ |
| 38 Oobe.showUserManagerScreen = function(showGuest, showAddPerson) { | 39 Oobe.showUserManagerScreen = function(showGuest, showAddPerson) { |
| 39 Oobe.getInstance().showScreen({id: 'account-picker', | 40 Oobe.getInstance().showScreen({id: 'account-picker', |
| 40 data: {disableAddUser: false}}); | 41 data: {disableAddUser: false}}); |
| 41 // The ChromeOS account-picker will hide the AddUser button if a user is | |
| 42 // logged in and the screen is "locked", so we must re-enabled it | |
| 43 $('add-user-header-bar-item').hidden = false; | |
| 44 | |
| 45 // Hide control options if the user does not have the right permissions. | 42 // Hide control options if the user does not have the right permissions. |
| 46 $('guest-user-button').hidden = !showGuest; | 43 document.querySelector('control-bar').showGuest = showGuest; |
| 47 $('add-user-button').hidden = !showAddPerson; | 44 document.querySelector('control-bar').showAddPerson = showAddPerson; |
|
Dan Beam
2016/02/12 23:42:24
re-use the result of this querySelector
Moe
2016/02/20 00:21:00
Done.
| |
| 48 $('login-header-bar').hidden = false; | |
| 49 | 45 |
| 50 // Disable the context menu, as the Print/Inspect element items don't | 46 // Disable the context menu, as the Print/Inspect element items don't |
| 51 // make sense when displayed as a widget. | 47 // make sense when displayed as a widget. |
| 52 document.addEventListener('contextmenu', function(e) {e.preventDefault();}); | 48 document.addEventListener('contextmenu', function(e) {e.preventDefault();}); |
| 53 | 49 |
| 54 var hash = window.location.hash; | 50 var hash = window.location.hash; |
| 55 if (hash && hash == '#tutorial') | 51 if (hash && hash == '#tutorial') |
| 56 UserManagerTutorial.startTutorial(); | 52 document.querySelector('user-manager-tutorial').startTutorial(); |
| 57 }; | 53 }; |
| 58 | 54 |
| 59 /** | 55 /** |
| 60 * Open a new browser for the given profile. | 56 * Open a new browser for the given profile. |
| 61 * @param {string} profilePath The profile's path. | 57 * @param {string} profilePath The profile's path. |
| 62 */ | 58 */ |
| 63 Oobe.launchUser = function(profilePath) { | 59 Oobe.launchUser = function(profilePath) { |
| 64 chrome.send('launchUser', [profilePath]); | 60 chrome.send('launchUser', [profilePath]); |
| 65 }; | 61 }; |
| 66 | 62 |
| 67 /** | 63 /** |
| 68 * Disables signin UI. | 64 * Disables signin UI. |
| 69 */ | 65 */ |
| 70 Oobe.disableSigninUI = function() { | 66 Oobe.disableSigninUI = function() { |
| 71 DisplayManager.disableSigninUI(); | 67 DisplayManager.disableSigninUI(); |
| 72 }; | 68 }; |
| 73 | 69 |
| 74 /** | 70 /** |
| 75 * Shows signin UI. | 71 * Shows signin UI. |
| 76 * @param {string} opt_email An optional email for signin UI. | 72 * @param {string=} optEmail An optional email for signin UI. |
|
Dan Beam
2016/02/12 23:42:24
this was correct
Moe
2016/02/20 00:21:00
Done.
|
Dan Beam
2016/02/12 23:42:24
opt_paramsLikeThis
Moe
2016/02/20 00:21:00
Done.
|
| 77 */ | 73 */ |
| 78 Oobe.showSigninUI = function(opt_email) { | 74 Oobe.showSigninUI = function(optEmail) { |
| 79 DisplayManager.showSigninUI(opt_email); | 75 DisplayManager.showSigninUI(optEmail); |
| 80 }; | 76 }; |
| 81 | 77 |
| 82 /** | 78 /** |
| 83 * Shows sign-in error bubble. | 79 * Shows sign-in error bubble. |
| 84 * @param {number} loginAttempts Number of login attemps tried. | 80 * @param {number} loginAttempts Number of login attempts tried. |
| 85 * @param {string} message Error message to show. | 81 * @param {string} message Error message to show. |
| 86 * @param {string} link Text to use for help link. | 82 * @param {string} link Text to use for help link. |
| 87 * @param {number} helpId Help topic Id associated with help link. | 83 * @param {number} helpId Help topic Id associated with help link. |
| 88 */ | 84 */ |
| 89 Oobe.showSignInError = function(loginAttempts, message, link, helpId) { | 85 Oobe.showSignInError = function(loginAttempts, message, link, helpId) { |
| 90 DisplayManager.showSignInError(loginAttempts, message, link, helpId); | 86 DisplayManager.showSignInError(loginAttempts, message, link, helpId); |
| 91 }; | 87 }; |
| 92 | 88 |
| 93 /** | 89 /** |
| 94 * Clears error bubble as well as optional menus that could be open. | 90 * Clears error bubble as well as optional menus that could be open. |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 106 | 102 |
| 107 /** | 103 /** |
| 108 * Restores input focus to currently selected pod. | 104 * Restores input focus to currently selected pod. |
| 109 */ | 105 */ |
| 110 Oobe.refocusCurrentPod = function() { | 106 Oobe.refocusCurrentPod = function() { |
| 111 DisplayManager.refocusCurrentPod(); | 107 DisplayManager.refocusCurrentPod(); |
| 112 }; | 108 }; |
| 113 | 109 |
| 114 /** | 110 /** |
| 115 * Show the user manager tutorial | 111 * Show the user manager tutorial |
| 116 * @param {string} email The user's email, if signed in. | |
| 117 * @param {string} displayName The user's display name. | |
| 118 */ | 112 */ |
| 119 Oobe.showUserManagerTutorial = function() { | 113 Oobe.showUserManagerTutorial = function() { |
| 120 UserManagerTutorial.startTutorial(); | 114 document.querySelector('user-manager-tutorial').startTutorial(); |
| 121 }; | 115 }; |
| 122 | 116 |
| 123 // Export | 117 // Export |
| 124 return { | 118 return { |
| 125 Oobe: Oobe | 119 Oobe: Oobe |
| 126 }; | 120 }; |
| 127 }); | 121 }); |
| 128 | 122 |
| 129 cr.define('UserManager', function() { | 123 cr.define('UserManager', function() { |
| 130 'use strict'; | 124 'use strict'; |
| 131 | 125 |
| 132 function initialize() { | 126 function initialize() { |
| 133 cr.ui.login.DisplayManager.initialize(); | 127 cr.ui.login.DisplayManager.initialize(); |
| 134 cr.ui.login.UserManagerTutorial.initialize(); | |
| 135 login.AccountPickerScreen.register(); | 128 login.AccountPickerScreen.register(); |
| 136 cr.ui.Bubble.decorate($('bubble')); | 129 cr.ui.Bubble.decorate($('bubble')); |
| 137 login.HeaderBar.decorate($('login-header-bar')); | |
| 138 | |
| 139 // Hide the header bar until the showUserManagerMethod can apply function | |
| 140 // parameters that affect widget visiblity. | |
| 141 $('login-header-bar').hidden = true; | |
| 142 | 130 |
| 143 chrome.send('userManagerInitialize', [window.location.hash]); | 131 chrome.send('userManagerInitialize', [window.location.hash]); |
| 144 } | 132 } |
| 145 | 133 |
| 146 // Return an object with all of the exports. | 134 // Return an object with all of the exports. |
| 147 return { | 135 return { |
| 148 initialize: initialize | 136 initialize: initialize |
| 149 }; | 137 }; |
| 150 }); | 138 }); |
| 151 | 139 |
| 152 var Oobe = cr.ui.Oobe; | 140 var Oobe = cr.ui.Oobe; |
| 153 | 141 |
| 154 // Allow selection events on components with editable text (password field) | 142 // Allow selection events on components with editable text (password field) |
| 155 // bug (http://code.google.com/p/chromium/issues/detail?id=125863) | 143 // bug (http://code.google.com/p/chromium/issues/detail?id=125863) |
| 156 disableTextSelectAndDrag(function(e) { | 144 disableTextSelectAndDrag(function(e) { |
| 157 var src = e.target; | 145 var src = e.target; |
| 158 return src instanceof HTMLTextAreaElement || | 146 return src instanceof HTMLTextAreaElement || |
| 159 src instanceof HTMLInputElement && | 147 src instanceof HTMLInputElement && |
| 160 /text|password|search/.test(src.type); | 148 /text|password|search/.test(src.type); |
| 161 }); | 149 }); |
| 162 | 150 |
| 163 document.addEventListener('DOMContentLoaded', UserManager.initialize); | 151 document.addEventListener('DOMContentLoaded', UserManager.initialize); |
| OLD | NEW |