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

Unified Diff: chrome/browser/resources/md_user_manager/user_manager.js

Issue 1630903002: material design user manager with create profile flow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Dan's comments Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
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 66%
copy from chrome/browser/resources/user_manager/user_manager.js
copy to chrome/browser/resources/md_user_manager/user_manager.js
index 39d76d4764abe302a71089b17d7563c0322f5290..2ee2ef6d94357a6e313449e5d078a80d7c0d1295 100644
--- a/chrome/browser/resources/user_manager/user_manager.js
+++ b/chrome/browser/resources/md_user_manager/user_manager.js
@@ -1,28 +1,27 @@
-// 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.
+ */
Dan Beam 2016/02/12 23:42:24 revert to single-line comments
Moe 2016/02/20 00:21:00 Done.
+
<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,
- * transitions, error messages display.
- * @extends {DisplayManager}
- * @constructor
+ * Constructs an Out of box controller. It manages initialization of screens,
+ * transitions, error messages display.
+ * @constructor
+ * @extends {DisplayManager}
*/
- function Oobe() {
- }
+ 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
cr.addSingletonGetter(Oobe);
@@ -32,20 +31,17 @@ cr.define('cr.ui', function() {
/**
* Shows the given screen.
- * @param {bool} showGuest Whether the 'Browse as Guest' button is displayed.
- * @param {bool} showAddPerson Whether the 'Add Person' button is displayed.
+ * @param {boolean} showGuest True if |Browse as Guest| button should be
+ * displayed.
+ * @param {boolean} showAddPerson True if |Add Person| button should be
+ * displayed.
*/
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;
Dan Beam 2016/02/12 23:42:24 re-use the result of this querySelector
Moe 2016/02/20 00:21:00 Done.
// Disable the context menu, as the Print/Inspect element items don't
// make sense when displayed as a widget.
@@ -53,7 +49,7 @@ cr.define('cr.ui', function() {
var hash = window.location.hash;
if (hash && hash == '#tutorial')
- UserManagerTutorial.startTutorial();
+ document.querySelector('user-manager-tutorial').startTutorial();
};
/**
@@ -73,15 +69,15 @@ cr.define('cr.ui', function() {
/**
* Shows signin UI.
- * @param {string} opt_email 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.
+ * @param {string=} optEmail An optional email for signin UI.
Dan Beam 2016/02/12 23:42:24 opt_paramsLikeThis
Moe 2016/02/20 00:21:00 Done.
*/
- Oobe.showSigninUI = function(opt_email) {
- DisplayManager.showSigninUI(opt_email);
+ Oobe.showSigninUI = function(optEmail) {
+ DisplayManager.showSigninUI(optEmail);
};
/**
* Shows sign-in error bubble.
- * @param {number} loginAttempts Number of login attemps tried.
+ * @param {number} loginAttempts Number of login attempts tried.
* @param {string} message Error message to show.
* @param {string} link Text to use for help link.
* @param {number} helpId Help topic Id associated with help link.
@@ -113,11 +109,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 +125,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]);
}

Powered by Google App Engine
This is Rietveld 408576698