[cros] User images are updated on the login screen.

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"
 #include "base/logging.h"
-#include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
@@ skipping 26 matching lines @@
 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 kKeyEmailAddress[] = "emailAddress";
 const char kKeySignedIn[] = "signedIn";
 const char kKeyCanRemove[] = "canRemove";
-const char kKeyImageUrl[] = "imageUrl";
 const char kKeyOauthTokenStatus[] = "oauthTokenStatus";
 
 // Max number of users to show.
 const int kMaxUsers = 5;
 
 const char kReasonNetworkChanged[] = "network changed";
 const char kReasonProxyChanged[] = "proxy changed";
 
 // Sanitize emails. Currently, it only ensures all emails have a domain.
 std::string SanitizeEmail(const std::string& email) {
@@ skipping 329 matching lines @@
 
 void SigninScreenHandler::OnLoginSuccess(const std::string& username) {
   base::StringValue username_value(username);
   web_ui_->CallJavascriptFunction("cr.ui.Oobe.onLoginSuccess", username_value);
 }
 
 void SigninScreenHandler::OnUserRemoved(const std::string& username) {
   SendUserList(false);
 }
 
+void SigninScreenHandler::OnUserImageChanged(const User& user) {
+  base::StringValue user_email(user.email());
+  web_ui_->CallJavascriptFunction(
+      "login.AccountPickerScreen.updateUserImage", user_email);
+}
+
 void SigninScreenHandler::ShowError(int login_attempts,
                                     const std::string& error_text,
                                     const std::string& help_link_text,
                                     HelpAppLauncher::HelpTopic help_topic_id) {
   base::FundamentalValue login_attempts_value(login_attempts);
   base::StringValue error_message(error_text);
   base::StringValue help_link(help_link_text);
   base::FundamentalValue help_id(static_cast<int>(help_topic_id));
   web_ui_->CallJavascriptFunction("cr.ui.Oobe.showSignInError",
                                   login_attempts_value,
@@ skipping 191 matching lines @@
 
       // 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);
 
-      if (!email.empty()) {
-        long long timestamp = base::TimeTicks::Now().ToInternalValue();
-        std::string image_url(
-            StringPrintf("%s%s?id=%lld",
-                         chrome::kChromeUIUserImageURL,
-                         email.c_str(),
-                         timestamp));
-        user_dict->SetString(kKeyImageUrl, image_url);
-      } else {
-        std::string image_url(std::string(chrome::kChromeUIScheme) + "://" +
-            std::string(chrome::kChromeUIThemePath) +
-            "/IDR_LOGIN_DEFAULT_USER");
-        user_dict->SetString(kKeyImageUrl, image_url);
-      }
-
       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(kKeyEmailAddress, "");
     guest_dict->SetBoolean(kKeyCanRemove, false);
     guest_dict->SetInteger(kKeyOauthTokenStatus,
                            User::OAUTH_TOKEN_STATUS_UNKNOWN);
-    std::string image_url(std::string(chrome::kChromeUIScheme) + "://" +
-        std::string(chrome::kChromeUIThemePath) + "/IDR_LOGIN_GUEST");
-    guest_dict->SetString(kKeyImageUrl, image_url);
     users_list.Append(guest_dict);
   }
 
   // Call the Javascript callback
   base::FundamentalValue animated_value(animated);
   web_ui_->CallJavascriptFunction("login.AccountPickerScreen.loadUsers",
                                   users_list, animated_value);
 }
 
 void SigninScreenHandler::HandleAccountPickerReady(
@@ skipping 76 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