[cros] Display emails of users are stored in a separate dictionary in Local State.

chrome/browser/resources/options/chromeos/accounts_options.js

 // Copyright (c) 2011 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.
 
 cr.define('options', function() {
 

[James Hawkins, 2011/12/02 18:12:01]

Remove blank line while you're here.

[Ivan Korotkov, 2011/12/02 18:30:30]

Done.

   var OptionsPage = options.OptionsPage;
 
   /////////////////////////////////////////////////////////////////////////////
   // AccountsOptions class:
 
   /**
    * Encapsulated handling of ChromeOS accounts options page.
    * @constructor
    */
   function AccountsOptions(model) {
@@ skipping 16 matching lines @@
 
       // Set up accounts page.
       var userList = $('userList');
 
       var userNameEdit = $('userNameEdit');
       options.accounts.UserNameEdit.decorate(userNameEdit);
       userNameEdit.addEventListener('add', this.handleAddUser_);
 
       // If the current user is not the owner, show some warning,
       // and do not show the user list.
-      if (AccountsOptions.currentUserIsOwner()) {
+      this.allowWhitelist_ = AccountsOptions.currentUserIsOwner();

[James Hawkins, 2011/12/02 18:12:01]

"Forward declare" and document this variable.

[Ivan Korotkov, 2011/12/02 18:30:30]

Done.

+      if (this.allowWhitelist_) {
         options.accounts.UserList.decorate(userList);
       } else {
         if (!AccountsOptions.whitelistIsManaged()) {
           $('ownerOnlyWarning').hidden = false;
         } else {
           this.managed = true;
         }
       }
 
       this.addEventListener('visibleChange', this.handleVisibleChange_);
 
       $('useWhitelistCheck').addEventListener('change',
           this.handleUseWhitelistCheckChange_.bind(this));
 
       Preferences.getInstance().addEventListener(
           $('useWhitelistCheck').pref,
           this.handleUseWhitelistPrefChange_.bind(this));
     },
 
     /**
      * Update user list control state.
      * @private
      */
     updateControls_: function() {
       $('userList').disabled =
-      $('userNameEdit').disabled = !AccountsOptions.currentUserIsOwner() ||
+      $('userNameEdit').disabled = !this.allowWhitelist_ ||
                                    AccountsOptions.whitelistIsManaged() ||
                                    !$('useWhitelistCheck').checked;
     },
 
     /**
      * Handler for OptionsPage's visible property change event.
      * @private
      * @param {Event} e Property change event.
      */
     handleVisibleChange_: function(e) {
       if (this.visible) {
         this.updateControls_();
-        if (AccountsOptions.currentUserIsOwner())
+        if (this.allowWhitelist_)
           $('userList').redraw();
       }
     },
 
     /**
      * Handler for allow guest check change.
      * @private
      */
     handleUseWhitelistCheckChange_: function(e) {
       // Whitelist existing users when guest login is being disabled.
@@ skipping 11 matching lines @@
     handleUseWhitelistPrefChange_: function(e) {
       this.updateControls_();
     },
 
     /**
      * Handler for "add" event fired from userNameEdit.
      * @private
      * @param {Event} e Add event fired from userNameEdit.
      */
     handleAddUser_: function(e) {
-      AccountsOptions.addUsers([e.user]);
+      console.log('Chrome -> whitelist "' + e.user.name + '" ' + e.user.email);

[James Hawkins, 2011/12/02 18:12:01]

Remove console spam.

[Ivan Korotkov, 2011/12/02 18:30:30]

Oops, done.

+      chrome.send('whitelistUser', [e.user.email, e.user.name]);
     }
   };
 
   /**
    * Returns whether the current user is owner or not.
    */
   AccountsOptions.currentUserIsOwner = function() {
     return localStrings.getString('current_user_is_owner') == 'true';
   };
 
   /**
    * Returns whether we're currently in guest mode.
    */
   AccountsOptions.loggedInAsGuest = function() {
     return localStrings.getString('logged_in_as_guest') == 'true';
   };
 
   /**
    * Returns whether the whitelist is managed by policy or not.
    */
   AccountsOptions.whitelistIsManaged = function() {
     return localStrings.getString('whitelist_is_managed') == 'true';
   };
 
   /**
    * Adds given users to userList.
+   * @param {Array.<Object>} users Array of user info objects.
    */
   AccountsOptions.addUsers = function(users) {
     var userList = $('userList');
     for (var i = 0; i < users.length; ++i) {
       userList.addUser(users[i]);
     }
   };
 
   /**
    * Update account picture.
-   * @param {string} email Email of the user to update.
+   * @param {string} username User for which to update the image.
    */
-  AccountsOptions.updateAccountPicture = function(email) {
-    if (this.currentUserIsOwner())
-      $('userList').updateAccountPicture(email);
+  AccountsOptions.updateAccountPicture = function(username) {
+    if (this.allowWhitelist_)
+      $('userList').updateAccountPicture(username);
   };
 
   // Export
   return {
     AccountsOptions: AccountsOptions
   };
 
 });