| Index: chrome/browser/resources/md_user_manager/user_manager.js
|
| diff --git a/chrome/browser/resources/user_manager/user_manager.js b/chrome/browser/resources/md_user_manager/user_manager.js
|
| similarity index 78%
|
| copy from chrome/browser/resources/user_manager/user_manager.js
|
| copy to chrome/browser/resources/md_user_manager/user_manager.js
|
| index 39d76d4764abe302a71089b17d7563c0322f5290..d83c964ea701c3c951ddac473726d92a0feced7d 100644
|
| --- a/chrome/browser/resources/user_manager/user_manager.js
|
| +++ b/chrome/browser/resources/md_user_manager/user_manager.js
|
| @@ -1,19 +1,19 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| +/* Copyright 2016 The Chromium Authors. All rights reserved.
|
| + * 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="control_bar.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/resource_loader.js">
|
| -<include src="user_manager_tutorial.js">
|
| +
|
|
|
| cr.define('cr.ui', function() {
|
| var DisplayManager = cr.ui.login.DisplayManager;
|
| - var UserManagerTutorial = cr.ui.login.UserManagerTutorial;
|
|
|
| /**
|
| * Constructs an Out of box controller. It manages initialization of screens,
|
| @@ -38,14 +38,9 @@ cr.define('cr.ui', function() {
|
| Oobe.showUserManagerScreen = function(showGuest, showAddPerson) {
|
| Oobe.getInstance().showScreen({id: 'account-picker',
|
| data: {disableAddUser: false}});
|
| - // The ChromeOS account-picker will hide the AddUser button if a user is
|
| - // logged in and the screen is "locked", so we must re-enabled it
|
| - $('add-user-header-bar-item').hidden = false;
|
| -
|
| // Hide control options if the user does not have the right permissions.
|
| - $('guest-user-button').hidden = !showGuest;
|
| - $('add-user-button').hidden = !showAddPerson;
|
| - $('login-header-bar').hidden = false;
|
| + document.querySelector('control-bar').showGuest = showGuest;
|
| + document.querySelector('control-bar').showAddPerson = showAddPerson;
|
|
|
| // Disable the context menu, as the Print/Inspect element items don't
|
| // make sense when displayed as a widget.
|
| @@ -53,7 +48,7 @@ cr.define('cr.ui', function() {
|
|
|
| var hash = window.location.hash;
|
| if (hash && hash == '#tutorial')
|
| - UserManagerTutorial.startTutorial();
|
| + document.querySelector('user-manager-tutorial').startTutorial();
|
| };
|
|
|
| /**
|
| @@ -113,11 +108,9 @@ cr.define('cr.ui', function() {
|
|
|
| /**
|
| * Show the user manager tutorial
|
| - * @param {string} email The user's email, if signed in.
|
| - * @param {string} displayName The user's display name.
|
| */
|
| Oobe.showUserManagerTutorial = function() {
|
| - UserManagerTutorial.startTutorial();
|
| + document.querySelector('user-manager-tutorial').startTutorial();
|
| };
|
|
|
| // Export
|
| @@ -131,14 +124,8 @@ cr.define('UserManager', function() {
|
|
|
| function initialize() {
|
| cr.ui.login.DisplayManager.initialize();
|
| - cr.ui.login.UserManagerTutorial.initialize();
|
| login.AccountPickerScreen.register();
|
| cr.ui.Bubble.decorate($('bubble'));
|
| - login.HeaderBar.decorate($('login-header-bar'));
|
| -
|
| - // Hide the header bar until the showUserManagerMethod can apply function
|
| - // parameters that affect widget visiblity.
|
| - $('login-header-bar').hidden = true;
|
|
|
| chrome.send('userManagerInitialize', [window.location.hash]);
|
| }
|
|
|