MD user manager (html/js/css for create profile flow)

chrome/browser/resources/md_user_manager/user_manager.js

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 45%
copy from chrome/browser/resources/user_manager/user_manager.js
copy to chrome/browser/resources/md_user_manager/user_manager.js
index 39d76d4764abe302a71089b17d7563c0322f5290..8be6d10cf2ed3c99ab61531b25960167d94c1a0c 100644
--- a/chrome/browser/resources/user_manager/user_manager.js
+++ b/chrome/browser/resources/md_user_manager/user_manager.js
@@ -1,155 +1,113 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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,
-  * transitions, error messages display.
-  * @extends {DisplayManager}
-  * @constructor
+   * Manages initialization of screens, transitions, and error messages.
+   * @constructor
+   * @extends {DisplayManager}
   */
-  function Oobe() {
-  }
+  function UserManager() {}
 
-  cr.addSingletonGetter(Oobe);
+  cr.addSingletonGetter(UserManager);
 
-  Oobe.prototype = {
+  UserManager.prototype = {
     __proto__: DisplayManager.prototype,
   };
 
   /**
-   * 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.
+   * Initializes the UserManager.
    */
-  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;
+  UserManager.initialize = function() {
+    cr.ui.login.DisplayManager.initialize();
+    login.AccountPickerScreen.register();
+    cr.ui.Bubble.decorate($('bubble'));
+
+    chrome.send('userManagerInitialize', [window.location.hash]);

[Dan Beam, 2016/03/08 21:10:30]

it's preferable to not interact with the browser directly so that we can isolate
just the JS for testing

[Moe, 2016/03/09 15:29:03]

Done.

+  };
 
+  /**
+   * Shows the given screen.
+   * @param {boolean} showGuest True if 'Browse as Guest' button should be
+   *     displayed.
+   * @param {boolean} showAddPerson True if 'Add Person' button should be
+   *     displayed.
+   */
+  UserManager.showUserManagerScreen = function(showGuest, showAddPerson) {
+    UserManager.getInstance().showScreen({id: 'account-picker',
+                                          data: {disableAddUser: 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;
+    var controlBar = document.querySelector('control-bar');
+    controlBar.showGuest = showGuest;
+    controlBar.showAddPerson = showAddPerson;
 
     // 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();});
 
-    var hash = window.location.hash;
-    if (hash && hash == '#tutorial')
-      UserManagerTutorial.startTutorial();
+    // TODO(mahmadi): start the tutorial if the location hash is #tutorial.
   };
 
   /**
    * Open a new browser for the given profile.
    * @param {string} profilePath The profile's path.
    */
-  Oobe.launchUser = function(profilePath) {
+  UserManager.launchUser = function(profilePath) {
     chrome.send('launchUser', [profilePath]);
   };
 
   /**
    * Disables signin UI.
    */
-  Oobe.disableSigninUI = function() {
+  UserManager.disableSigninUI = function() {
     DisplayManager.disableSigninUI();
   };
 
   /**
    * Shows signin UI.
-   * @param {string} opt_email An optional email for signin UI.
+   * @param {string=} opt_email An optional email for signin UI.
    */
-  Oobe.showSigninUI = function(opt_email) {
+  UserManager.showSigninUI = function(opt_email) {
     DisplayManager.showSigninUI(opt_email);
   };
 
   /**
    * 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.
    */
-  Oobe.showSignInError = function(loginAttempts, message, link, helpId) {
+  UserManager.showSignInError = function(loginAttempts, message, link, helpId) {
     DisplayManager.showSignInError(loginAttempts, message, link, helpId);
   };
 
   /**
    * Clears error bubble as well as optional menus that could be open.
    */
-  Oobe.clearErrors = function() {
+  UserManager.clearErrors = function() {
     DisplayManager.clearErrors();
   };

[Dan Beam, 2016/03/08 21:10:30]

this class looks mainly like a wrapper?  what's the point of it?

[Moe, 2016/03/09 15:29:03]

That's correct. src/chrome/browser/resources/chromeos/login/login_common.js
creates a wrapper around cr.ui.login.DisplayManager called Oobe. Oobe is what
being used in src/ui/login/account_picker/user_pod_row.js (which is shared
between cros and desktop). Creating UserManager and then aliasing it to Oobe is
to make user_pod_row.js work in desktop as well without having to fork and
modify it. This is at least why i think this was done this way initially.

 
-  /**
-   * Clears password field in user-pod.
-   */
-  Oobe.clearUserPodPassword = function() {
-    DisplayManager.clearUserPodPassword();
-  };
-
-  /**
-   * Restores input focus to currently selected pod.
-   */
-  Oobe.refocusCurrentPod = function() {
-    DisplayManager.refocusCurrentPod();
-  };
-
-  /**
-   * 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();
-  };
-
   // Export
   return {
-    Oobe: Oobe
-  };
-});
-
-cr.define('UserManager', function() {
-  'use strict';
-
-  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]);
-  }
-
-  // Return an object with all of the exports.
-  return {
-    initialize: initialize
+    UserManager: UserManager
   };
 });
 
-var Oobe = cr.ui.Oobe;
+// Alias to Oobe for use in src/ui/login/account_picker/user_pod_row.js
+var Oobe = cr.ui.UserManager;
 
 // Allow selection events on components with editable text (password field)
 // bug (http://code.google.com/p/chromium/issues/detail?id=125863)
@@ -160,4 +118,4 @@ disableTextSelectAndDrag(function(e) {
          /text|password|search/.test(src.type);
 });
 
-document.addEventListener('DOMContentLoaded', UserManager.initialize);
+document.addEventListener('DOMContentLoaded', cr.ui.UserManager.initialize);