Make ProfileImageDownloader available to non-chromeos code

chrome/browser/chromeos/login/user_manager.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/chromeos/login/user_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/browser/gaia_userinfo/profile_downloader.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
 #include "crypto/nss_util.h"
@@ skipping 403 matching lines @@
                      GetBitmapNamed(IDR_PROFILE_PICTURE_LOADING));
     SaveImageToLocalState(username, "", User::kProfileImageIndex, false);
   }
 }
 
 void UserManager::DownloadProfileImage() {
   if (profile_image_downloader_.get()) {
     // Another download is already in progress
     return;
   }
-  profile_image_downloader_.reset(new ProfileImageDownloader(this));
+  profile_image_downloader_.reset(new ProfileDownloader(this));
   profile_image_downloader_->Start();
   profile_image_load_start_time_ = base::Time::Now();
 }
 
 void UserManager::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                             base::Bind(&UserManager::CheckOwnership,
@@ skipping 315 matching lines @@
 
   // UserManager should be accessed only on UI thread.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&UserManager::UpdateOwnership,
                  base::Unretained(this),
                  is_owner));
 }
 
-void UserManager::OnDownloadSuccess(const SkBitmap& image) {
+int UserManager::GetDesiredImageSize() {
+  return login::kUserImageSize;
+}
+
+std::string UserManager::GetProfileUserName() {
+  return logged_in_user().email();
+}
+
+Profile* UserManager::GetBrowserProfile() {
+  return ProfileManager::GetDefaultProfile();

[whywhat, 2011/11/15 12:19:21]

Guess you need to include profile_manager.h for this.

[sail, 2011/11/15 20:17:22]

Done.

+}
+
+void UserManager::OnDownloadSuccess(const string16& full_name,

[whywhat, 2011/11/15 12:19:21]

We should at least DCHECK that full_name is the same as logged_in_user().email()
there and in the other handler.

[sail, 2011/11/15 20:17:22]

Actually the full_name here is the first and last name of the user. I added a
comment to ProfileDownloader to explain this.

+                                    const SkBitmap& image) {
   VLOG(1) << "Downloaded profile image for logged-in user.";
   UMA_HISTOGRAM_ENUMERATION("UserImageDownloadResult.LoggedIn",
-                            ProfileImageDownloader::kDownloadSuccess,
-                            ProfileImageDownloader::kDownloadResultsCount);
+                            ProfileDownloader::kDownloadSuccess,
+                            ProfileDownloader::kDownloadResultsCount);
 
   // Check if this image is not the same as already downloaded.
   std::string new_image_data_url = web_ui_util::GetImageDataUrl(image);
   if (!downloaded_profile_image_data_url_.empty() &&
       new_image_data_url == downloaded_profile_image_data_url_)
     return;
 
   downloaded_profile_image_data_url_ = new_image_data_url;
   downloaded_profile_image_ = image;
 
   if (logged_in_user().image_index() == User::kProfileImageIndex) {
     std::string current_image_data_url =
         web_ui_util::GetImageDataUrl(logged_in_user().image());
     if (current_image_data_url == new_image_data_url)
       return;
 
     VLOG(1) << "Updating profile image for logged-in user";
     UMA_HISTOGRAM_ENUMERATION("UserImageDownloadResult.LoggedIn",
-                              ProfileImageDownloader::kDownloadSuccessChanged,
-                              ProfileImageDownloader::kDownloadResultsCount);
+                              ProfileDownloader::kDownloadSuccessChanged,
+                              ProfileDownloader::kDownloadResultsCount);
 
     // This will persist |downloaded_profile_image_| to file.
     SaveUserImageFromProfileImage(logged_in_user().email());
   }
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
       content::Source<UserManager>(this),
       content::Details<const SkBitmap>(&image));
 
   profile_image_downloader_.reset();
 }
 
 void UserManager::OnDownloadFailure() {
   VLOG(1) << "Download of profile image for logged-in user failed.";
   UMA_HISTOGRAM_ENUMERATION("UserImageDownloadResult.LoggedIn",
-                            ProfileImageDownloader::kDownloadFailure,
-                            ProfileImageDownloader::kDownloadResultsCount);
+                            ProfileDownloader::kDownloadFailure,
+                            ProfileDownloader::kDownloadResultsCount);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
       content::Source<UserManager>(this),
       content::NotificationService::NoDetails());
   profile_image_downloader_.reset();
 }
 
-void UserManager::OnDownloadDefaultImage() {
+void UserManager::OnDownloadDefaultImage(const string16& full_name) {
   VLOG(1) << "Logged-in user still has the default profile image.";
   UMA_HISTOGRAM_ENUMERATION("UserImageDownloadResult.LoggedIn",
-                            ProfileImageDownloader::kDownloadDefault,
-                            ProfileImageDownloader::kDownloadResultsCount);
+                            ProfileDownloader::kDownloadDefault,
+                            ProfileDownloader::kDownloadResultsCount);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
       content::Source<UserManager>(this),
       content::NotificationService::NoDetails());
   profile_image_downloader_.reset();
 }
 
 User* UserManager::CreateUser(const std::string& email) const {
   User* user = new User(email);
   user->set_oauth_token_status(GetUserOAuthStatus(email));
   // Used to determine whether user's display name is unique.
   ++display_name_count_[user->GetDisplayName()];
   return user;
 }
 
 }  // namespace chromeos