| Index: chrome/browser/resources/md_user_manager/user_manager.js
|
| diff --git a/chrome/browser/resources/md_user_manager/user_manager.js b/chrome/browser/resources/md_user_manager/user_manager.js
|
| index 3c0ff88ab50e6ad3925095ac6ea1e6587f569c89..0955ab958d654c64465e5a74403bcde123e97c60 100644
|
| --- a/chrome/browser/resources/md_user_manager/user_manager.js
|
| +++ b/chrome/browser/resources/md_user_manager/user_manager.js
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -<include src="../../../../ui/login/screen.js">
|
| -<include src="../../../../ui/login/bubble.js">
|
| -<include src="../../../../ui/login/login_ui_tools.js">
|
| -<include src="../../../../ui/login/display_manager.js">
|
| -<include src="../../../../ui/login/account_picker/screen_account_picker.js">
|
| -<include src="../../../../ui/login/account_picker/user_pod_row.js">
|
| +// <include src="../../../../ui/login/screen.js">
|
| +// <include src="../../../../ui/login/bubble.js">
|
| +// <include src="../../../../ui/login/login_ui_tools.js">
|
| +// <include src="../../../../ui/login/display_manager.js">
|
| +// <include src="../../../../ui/login/account_picker/screen_account_picker.js">
|
| +// <include src="../../../../ui/login/account_picker/user_pod_row.js">
|
|
|
|
|
| cr.define('cr.ui', function() {
|
| @@ -95,8 +95,8 @@ cr.define('cr.ui', function() {
|
| * displayed.
|
| */
|
| UserManager.showUserManagerScreen = function(showGuest, showAddPerson) {
|
| - UserManager.getInstance().showScreen({id: 'account-picker',
|
| - data: {disableAddUser: false}});
|
| + UserManager.getInstance().showScreen(
|
| + {id: 'account-picker', data: {disableAddUser: false}});
|
| // Hide control options if the user does not have the right permissions.
|
| var controlBar = document.querySelector('control-bar');
|
| controlBar.showGuest = showGuest;
|
| @@ -104,13 +104,15 @@ cr.define('cr.ui', function() {
|
|
|
| // Disable the context menu, as the Print/Inspect element items don't
|
| // make sense when displayed as a widget.
|
| - document.addEventListener('contextmenu', function(e) {e.preventDefault();});
|
| + document.addEventListener('contextmenu', function(e) {
|
| + e.preventDefault();
|
| + });
|
|
|
| if (window.location.hash == '#tutorial')
|
| document.querySelector('user-manager-tutorial').startTutorial();
|
| else if (window.location.hash == '#create-user') {
|
| - document.querySelector('user-manager-pages').setSelectedPage(
|
| - 'create-user-page');
|
| + document.querySelector('user-manager-pages')
|
| + .setSelectedPage('create-user-page');
|
| }
|
| };
|
|
|
| @@ -164,9 +166,7 @@ cr.define('cr.ui', function() {
|
| };
|
|
|
| // Export
|
| - return {
|
| - UserManager: UserManager
|
| - };
|
| + return {UserManager: UserManager};
|
| });
|
|
|
| // Alias to Oobe for use in src/ui/login/account_picker/user_pod_row.js
|
| @@ -177,8 +177,7 @@ var Oobe = cr.ui.UserManager;
|
| disableTextSelectAndDrag(function(e) {
|
| var src = e.target;
|
| return src instanceof HTMLTextAreaElement ||
|
| - src instanceof HTMLInputElement &&
|
| - /text|password|search/.test(src.type);
|
| + src instanceof HTMLInputElement && /text|password|search/.test(src.type);
|
| });
|
|
|
| document.addEventListener('DOMContentLoaded', cr.ui.UserManager.initialize);
|
|
|