[cros] Initial user image loading and repeated profile image loading fixes.

chrome/browser/ui/webui/options/chromeos/change_picture_options_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/options/chromeos/change_picture_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 41 matching lines @@
   file_type_info.extensions[4].push_back(FILE_PATH_LITERAL("tif"));
   file_type_info.extensions[4].push_back(FILE_PATH_LITERAL("tiff"));
 
   return file_type_info;
 }
 
 }  // namespace
 
 ChangePictureOptionsHandler::ChangePictureOptionsHandler()
     : previous_image_data_url_(chrome::kAboutBlankURL),
+      previous_image_index_(User::kInvalidImageIndex),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
       content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
       content::NotificationService::AllSources());
 }
 
 ChangePictureOptionsHandler::~ChangePictureOptionsHandler() {
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
@@ skipping 33 matching lines @@
 }
 
 void ChangePictureOptionsHandler::RegisterMessages() {
   DCHECK(web_ui_);
   web_ui_->RegisterMessageCallback("chooseFile",
       base::Bind(&ChangePictureOptionsHandler::HandleChooseFile,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("takePhoto",
       base::Bind(&ChangePictureOptionsHandler::HandleTakePhoto,
                  base::Unretained(this)));
-  web_ui_->RegisterMessageCallback("getSelectedImage",
-      base::Bind(&ChangePictureOptionsHandler::HandleGetSelectedImage,
+  web_ui_->RegisterMessageCallback("onPageShown",
+      base::Bind(&ChangePictureOptionsHandler::HandleOnPageShown,
                  base::Unretained(this)));
   web_ui_->RegisterMessageCallback("selectImage",
       base::Bind(&ChangePictureOptionsHandler::HandleSelectImage,
                  base::Unretained(this)));
 }
 
 void ChangePictureOptionsHandler::SendAvailableImages() {
   ListValue image_urls;
   for (int i = 0; i < kDefaultImagesCount; ++i) {
     image_urls.Append(new StringValue(GetDefaultImageUrl(i)));
@@ skipping 31 matching lines @@
 
 void ChangePictureOptionsHandler::HandleTakePhoto(const ListValue* args) {
   DCHECK(args && args->empty());
   views::Widget* window = browser::CreateViewsWindow(
       GetBrowserWindow(),
       new TakePhotoDialog(this));
   window->SetAlwaysOnTop(true);
   window->Show();
 }
 
-void ChangePictureOptionsHandler::HandleGetSelectedImage(
+void ChangePictureOptionsHandler::HandleOnPageShown(
     const base::ListValue* args) {
-  // TODO(ivankr): rename this function as it has become much bigger
-  // than just querying the currently selected image.
   DCHECK(args && args->empty());
   CheckCameraPresence();
   SendSelectedImage();
-  // Fetch user's profile picture again to see if it has changed.
-  UserManager::Get()->DownloadProfileImage();
+  UpdateProfileImage();
 }
 
 void ChangePictureOptionsHandler::SendSelectedImage() {
   const User& user = UserManager::Get()->logged_in_user();
   DCHECK(!user.email().empty());
 
   previous_image_index_ = user.image_index();
-  if (previous_image_index_ == User::kInvalidImageIndex) {
-    // TODO(ivankr): this may happen if user image hasn't completed loading
-    // from file yet.
-    previous_image_index_ = 0;
-  }
-
   switch (previous_image_index_) {
     case User::kExternalImageIndex: {
       // User has image from camera/file, record it and add to the image list.
       previous_image_ = user.image();
       previous_image_data_url_ = web_ui_util::GetImageDataUrl(previous_image_);
       web_ui_->CallJavascriptFunction("ChangePictureOptions.setOldImage");
       break;
     }
     case User::kProfileImageIndex: {
       // User has his/her Profile image as the current image.
-      base::StringValue image_data_url(
-          web_ui_util::GetImageDataUrl(user.image()));
-      base::FundamentalValue select(true);
-      web_ui_->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
-                                      image_data_url, select);
+      SendProfileImage(user.image(), true);
       break;
     }
     default: {
       DCHECK(previous_image_index_ >= 0 &&
              previous_image_index_ < kDefaultImagesCount);
       // User has image from the set of default images.
       base::StringValue image_url(GetDefaultImageUrl(previous_image_index_));
       web_ui_->CallJavascriptFunction("ChangePictureOptions.setSelectedImage",
                                       image_url);
     }
   }
 }
 
+void ChangePictureOptionsHandler::SendProfileImage(const SkBitmap& image,
+                                                   bool should_select) {
+  base::StringValue data_url(web_ui_util::GetImageDataUrl(image));
+  base::FundamentalValue select(should_select);
+  web_ui_->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
+                                  data_url, select);
+}
+
+void ChangePictureOptionsHandler::UpdateProfileImage() {
+  UserManager* user_manager = UserManager::Get();
+
+  // If we have a downloaded profile image and haven't sent it in
+  // |SendSelectedImage|, send it now (without selecting).
+  if (previous_image_index_ != User::kProfileImageIndex &&
+      !user_manager->downloaded_profile_image().empty())
+    SendProfileImage(user_manager->downloaded_profile_image(), false);
+
+  user_manager->DownloadProfileImage();
+}
+
 void ChangePictureOptionsHandler::HandleSelectImage(const ListValue* args) {
   std::string image_url;
   if (!args ||
       args->GetSize() != 1 ||
       !args->GetString(0, &image_url)) {
     NOTREACHED();
     return;
   }
   if (image_url.empty())
     return;
 
   UserManager* user_manager = UserManager::Get();
   const User& user = user_manager->logged_in_user();
   int image_index = User::kInvalidImageIndex;
 
-  // TODO(ivankr): set profile image from downloaded_profile_image() here.
-
   if (StartsWithASCII(image_url, chrome::kChromeUIUserImageURL, false)) {
     // Image from file/camera uses kChromeUIUserImageURL as URL while
     // current profile image always has a full data URL.
     // This way transition from (current profile image) to
     // (profile image, current image from file) is easier.
 
     DCHECK(!previous_image_.empty());
     user_manager->SaveUserImage(user.email(), previous_image_);
 
     UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
@@ skipping 62 matching lines @@
                    CameraDetector::kCameraPresent);
 }
 
 void ChangePictureOptionsHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   OptionsPageUIHandler::Observe(type, source, details);
   if (type == chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED) {
     // User profile image has been updated.
-    std::string data_url = web_ui_util::GetImageDataUrl(
-        *content::Details<const SkBitmap>(details).ptr());
-    base::StringValue data_url_value(data_url);
-    base::FundamentalValue select(false);
-    web_ui_->CallJavascriptFunction("ChangePictureOptions.setProfileImage",
-                                    data_url_value, select);
+    SendProfileImage(*content::Details<const SkBitmap>(details).ptr(), false);
   }
 }
 
 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {
   Browser* browser =
       BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_));
   if (!browser)
     return NULL;
   return browser->window()->GetNativeHandle();
 }
 
 }  // namespace chromeos