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

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
@@ skipping 34 matching lines @@
 
 // Account picker screen id.
 const char kAccountPickerScreen[] = "account-picker";
 // Sign in screen id for GAIA extension hosted content.
 const char kGaiaSigninScreen[] = "gaia-signin";
 // Start page of GAIA authentication extension.
 const char kGaiaExtStartPage[] =
     "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/main.html";
 
 // User dictionary keys.
-const char kKeyName[] = "name";
+const char kKeyUsername[] = "username";
+const char kKeyDisplayName[] = "displayName";
 const char kKeyEmailAddress[] = "emailAddress";
+const char kKeyNameTooltip[] = "nameTooltip";
 const char kKeySignedIn[] = "signedIn";
 const char kKeyCanRemove[] = "canRemove";
 const char kKeyOauthTokenStatus[] = "oauthTokenStatus";
 
 // Max number of users to show.
 const int kMaxUsers = 5;
 
 const char kReasonNetworkChanged[] = "network changed";
 const char kReasonProxyChanged[] = "proxy changed";
 
@@ skipping 449 matching lines @@
     const std::string& username,
     const std::string& password) {
   VLOG(2) << "ShowSigninScreenForCreds " << username << " " << password;
 
   test_user_ = username;
   test_pass_ = password;
   HandleShowAddUser(NULL);
 }
 
 void SigninScreenHandler::HandleCompleteLogin(const base::ListValue* args) {
   std::string username;

[whywhat, 2011/12/05 12:14:49]

Rename this username to typed_email

[Ivan Korotkov, 2011/12/05 14:12:48]

Done.

   std::string password;
   if (!args->GetString(0, &username) ||
       !args->GetString(1, &password)) {
     NOTREACHED();
     return;
   }
 
   username = SanitizeEmail(username);
+  delegate_->SetDisplayEmail(username);
   delegate_->CompleteLogin(username, password);
 }
 
 void SigninScreenHandler::HandleAuthenticateUser(const base::ListValue* args) {
   std::string username;
   std::string password;
   if (!args->GetString(0, &username) ||
       !args->GetString(1, &password)) {
     NOTREACHED();
     return;
@@ skipping 71 matching lines @@
   for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {
     const std::string& email = (*it)->email();
     std::string owner;
     chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
     bool is_owner = (email == owner);
     bool signed_in = UserManager::Get()->user_is_logged_in() &&
         email == UserManager::Get()->logged_in_user().email();
 
     if (non_owner_count < max_non_owner_users || is_owner) {
       DictionaryValue* user_dict = new DictionaryValue();
-      user_dict->SetString(kKeyName, (*it)->GetDisplayName());
-      user_dict->SetString(kKeyEmailAddress, email);
+      user_dict->SetString(kKeyUsername, email);
+      user_dict->SetString(kKeyEmailAddress, (*it)->display_email());
+      user_dict->SetString(kKeyDisplayName, (*it)->GetDisplayName());
+      if ((*it)->NeedsNameTooltip())
+        user_dict->SetString(kKeyNameTooltip, (*it)->GetNameTooltip());
       user_dict->SetInteger(kKeyOauthTokenStatus, (*it)->oauth_token_status());
       user_dict->SetBoolean(kKeySignedIn, signed_in);
 
       // Single user check here is necessary because owner info might not be
       // available when running into login screen on first boot.
       // See http://crosbug.com/12723
       user_dict->SetBoolean(kKeyCanRemove,
                             !single_user &&
                             !email.empty() &&
                             !is_owner &&
                             !signed_in);
 
       users_list.Append(user_dict);
       if (!is_owner)
         ++non_owner_count;
     }
   }
 
   if (show_guest) {
     // Add the Guest to the user list.
     DictionaryValue* guest_dict = new DictionaryValue();
-    guest_dict->SetString(kKeyName, l10n_util::GetStringUTF16(IDS_GUEST));
+    guest_dict->SetString(kKeyUsername, "");
     guest_dict->SetString(kKeyEmailAddress, "");
+    guest_dict->SetString(kKeyDisplayName,
+                          l10n_util::GetStringUTF16(IDS_GUEST));
     guest_dict->SetBoolean(kKeyCanRemove, false);
     guest_dict->SetInteger(kKeyOauthTokenStatus,
                            User::OAUTH_TOKEN_STATUS_UNKNOWN);
     users_list.Append(guest_dict);
   }
 
   // Call the Javascript callback
   base::FundamentalValue animated_value(animated);
   web_ui_->CallJavascriptFunction("login.AccountPickerScreen.loadUsers",
                                   users_list, animated_value);
@@ skipping 79 matching lines @@
 
   cookie_remover_ = new BrowsingDataRemover(
       Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()),
       BrowsingDataRemover::EVERYTHING,
       base::Time());
   cookie_remover_->AddObserver(this);
   cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA);
 }
 
 }  // namespace chromeos