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

chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc
index 41550f5a61e0f03a0dd48c9f7b992e36b012ddf6..47a09452d213c1882c48947d6a471e6cb74a0f80 100644
--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc
@@ -32,13 +32,13 @@ AccountsOptionsHandler::~AccountsOptionsHandler() {
 void AccountsOptionsHandler::RegisterMessages() {
   DCHECK(web_ui_);
   web_ui_->RegisterMessageCallback("whitelistUser",
-      base::Bind(&AccountsOptionsHandler::WhitelistUser,
+      base::Bind(&AccountsOptionsHandler::HandleWhitelistUser,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("unwhitelistUser",
-      base::Bind(&AccountsOptionsHandler::UnwhitelistUser,
+      base::Bind(&AccountsOptionsHandler::HandleUnwhitelistUser,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("whitelistExistingUsers",
-      base::Bind(&AccountsOptionsHandler::WhitelistExistingUsers,
+      base::Bind(&AccountsOptionsHandler::HandleWhitelistExistingUsers,
                  base::Unretained(this)));
 }
 
@@ -64,9 +64,12 @@ void AccountsOptionsHandler::GetLocalizedValues(
   localized_strings->SetString("owner_only", l10n_util::GetStringUTF16(
       IDS_OPTIONS_ACCOUNTS_OWNER_ONLY));
 
-  std::string owner;
-  CrosSettings::Get()->GetString(kDeviceOwner, &owner);
-  localized_strings->SetString("owner_user_id", UTF8ToUTF16(owner));
+  std::string owner_email;
+  CrosSettings::Get()->GetString(kDeviceOwner, &owner_email);
+  // Translate owner's email to the display email.
+  std::string display_email =
+      UserManager::Get()->GetUserDisplayEmail(owner_email);
+  localized_strings->SetString("owner_user_id", UTF8ToUTF16(display_email));
 
   localized_strings->SetString("current_user_is_owner",
       UserManager::Get()->current_user_is_owner() ?
@@ -79,47 +82,79 @@ void AccountsOptionsHandler::GetLocalizedValues(
           ASCIIToUTF16("true") : ASCIIToUTF16("false"));
 }
 
-void AccountsOptionsHandler::WhitelistUser(const base::ListValue* args) {
+base::DictionaryValue* AccountsOptionsHandler::CreateUserInfo(
+    const std::string& username,
+    const std::string& display_email,
+    const std::string& display_name) {
+  base::DictionaryValue* user_dict = new DictionaryValue;

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

This doesn't appear necessary to be on the object. Move to unnamed namespace?

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

This is called from CoreChromeOSOptionsHandler

+  user_dict->SetString("username", username);
+  user_dict->SetString("name", display_email);
+  user_dict->SetString("email", display_name);
+  user_dict->SetBoolean("owner", IsLoggedInOwner(username));
+  return user_dict;
+}
+
+void AccountsOptionsHandler::HandleWhitelistUser(const base::ListValue* args) {
   std::string email;
-  if (!args->GetString(0, &email)) {
+  std::string name;
+  if (!args->GetString(0, &email) ||
+      !args->GetString(1, &name)) {
     return;
   }
 
-  scoped_ptr<base::StringValue> canonical_email(
-      base::Value::CreateStringValue(Authenticator::Canonicalize(email)));
-  CrosSettings::Get()->AppendToList(kAccountsPrefUsers, canonical_email.get());
+  std::string canonical_email = Authenticator::Canonicalize(email);
+  // Record a display email for the whitelisted user if it doesn't exist yet.
+  UserManager::Get()->SaveUserDisplayEmail(canonical_email, email, false);
+
+  if (WhitelistUser(canonical_email)) {
+    base::ListValue single_user;
+    single_user.Append(CreateUserInfo(canonical_email, email, name));
+    web_ui_->CallJavascriptFunction("AccountsOptions.addUsers", single_user);
+  }
 }
 
-void AccountsOptionsHandler::UnwhitelistUser(const base::ListValue* args) {
+void AccountsOptionsHandler::HandleUnwhitelistUser(
+    const base::ListValue* args) {
   std::string email;
   if (!args->GetString(0, &email)) {
     return;
   }
 
-  scoped_ptr<base::StringValue> canonical_email(
-      base::Value::CreateStringValue(Authenticator::Canonicalize(email)));
-  CrosSettings::Get()->RemoveFromList(kAccountsPrefUsers,
-                                      canonical_email.get());
+  base::StringValue canonical_email(Authenticator::Canonicalize(email));
+  CrosSettings::Get()->RemoveFromList(kAccountsPrefUsers, &canonical_email);
+  // TODO(ivankr): this will not remove user's diplayed email if there is
+  // no such user.
   UserManager::Get()->RemoveUser(email, NULL);
 }
 
-void AccountsOptionsHandler::WhitelistExistingUsers(
+void AccountsOptionsHandler::HandleWhitelistExistingUsers(
     const base::ListValue* args) {
   base::ListValue whitelist_users;
   const UserList& users = UserManager::Get()->GetUsers();
   for (UserList::const_iterator it = users.begin(); it < users.end(); ++it) {
     const std::string& email = (*it)->email();
-    if (!CrosSettings::Get()->FindEmailInList(kAccountsPrefUsers, email)) {
-      base::DictionaryValue* user_dict = new DictionaryValue;
-      user_dict->SetString("name", (*it)->GetDisplayName());
-      user_dict->SetString("email", email);
-      user_dict->SetBoolean("owner", false);
-
-      whitelist_users.Append(user_dict);
+    if (WhitelistUser(email)) {
+      whitelist_users.Append(CreateUserInfo(
+          email, (*it)->display_email(), (*it)->GetDisplayName()));
     }
   }
 
   web_ui_->CallJavascriptFunction("AccountsOptions.addUsers", whitelist_users);
 }
 
+bool AccountsOptionsHandler::WhitelistUser(const std::string& username) {

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

Same as above; consider moving to unnamed namespace.

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

Done.

+  CrosSettings* cros_settings = CrosSettings::Get();
+  if (cros_settings->FindEmailInList(kAccountsPrefUsers, username))
+    return false;
+  base::StringValue username_value(username);
+  cros_settings->AppendToList(kAccountsPrefUsers, &username_value);
+  return true;
+}
+
+bool AccountsOptionsHandler::IsLoggedInOwner(const std::string& username) {
+  UserManager* user_manager = UserManager::Get();
+  return user_manager->current_user_is_owner() &&
+      user_manager->logged_in_user().email() == username;
+}
+
 }  // namespace chromeos