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

chrome/browser/resources/options/personal_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() {
 
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
    * Encapsulated handling of personal options page.
    * @constructor
    */
   function PersonalOptions() {
     OptionsPage.call(this, 'personal',
                      templateData.personalPageTabTitle,
                      'personal-page');
     if (cr.isChromeOS) {
-      // Email of the currently logged in user (or |kGuestUser|).
-      this.userEmail_ = localStrings.getString('userEmail');
+      // Username (canonical email) of the currently logged in user or
+      // |kGuestUser| if a guest session is active.
+      this.username_ = localStrings.getString('username');
     }
   }
 
   cr.addSingletonGetter(PersonalOptions);
 
   PersonalOptions.prototype = {
     // Inherit PersonalOptions from OptionsPage.
     __proto__: options.OptionsPage.prototype,
 
     // State variables.
@@ skipping 267 matching lines @@
      */
     getStartStopSyncButton_: function() {
       return $('start-stop-sync');
     },
 
     /**
      * (Re)loads IMG element with current user account picture.
      */
     updateAccountPicture_: function() {
       $('account-picture').src =
-          'chrome://userimage/' + this.userEmail_ +
+          'chrome://userimage/' + this.username_ +
           '?id=' + (new Date()).getTime();
     },
   };
 
   /**
    * Returns whether the user should be able to manage (view and edit) their
    * stored passwords. Password management is disabled in guest mode.
    * @return {boolean} True if password management should be disabled.
    */
   PersonalOptions.disablePasswordManagement = function() {
     return cr.commandLine.options['--bwsi'];
   };
 
   /**
    * Returns whether the user should be able to manage autofill settings.
    * @return {boolean} True if password management should be disabled.
    */
   PersonalOptions.disableAutofillManagement = function() {
     return cr.commandLine.options['--bwsi'];
   };
 
   if (cr.isChromeOS) {
     /**
-     * Returns email of the user logged in (ChromeOS only).
+     * Returns username (canonical email) of the user logged in (ChromeOS only).

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

You keep specifying "canonical email" everywhere because it is indeed confusing.
Why not just s/username/canonicalEmail/?

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

IMO it would create a mess given that C++ extensively uses "username" and that
there has been no concept of "canonical email" before. I think I'd rather
document it clearly in some single place in JS.

      * @return {string} user email.
      */
-    PersonalOptions.getLoggedInUserEmail = function() {
-      return PersonalOptions.getInstance().userEmail_;
+    PersonalOptions.getLoggedInUsername = function() {
+      return PersonalOptions.getInstance().username_;
     };
   }
 
   // Forward public APIs to private implementations.
   [
     'getStartStopSyncButton',
     'hideSyncSection',
     'setAutoLoginVisible',
     'setCustomizeSyncButtonEnabled',
     'setGtkThemeButtonEnabled',
@@ skipping 15 matching lines @@
       return PersonalOptions.getInstance()[name + '_'](value);
     };
   });
 
   // Export
   return {
     PersonalOptions: PersonalOptions
   };
 
 });