Remove unnecessary image downloading handler of notifications.

chrome/browser/notifications/message_center_notification_manager.cc

 // Copyright (c) 2012 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/notifications/message_center_notification_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 128 matching lines @@
   // default message center (extension_id.empty()).
 
   // If there exist apps/extensions that have notificationProvider permission,
   // route notifications to one of the apps/extensions.
   std::string extension_id = GetExtensionTakingOverNotifications(profile);
   if (!extension_id.empty())
     profile_notification->AddToAlternateProvider(extension_id);
 
   message_center_->AddNotification(make_scoped_ptr(
       new message_center::Notification(profile_notification->notification())));
-  profile_notification->StartDownloads();
 }
 
 bool MessageCenterNotificationManager::Update(const Notification& notification,
                                               Profile* profile) {
   const base::string16& replace_id = notification.replace_id();
   if (replace_id.empty())
     return false;
 
   const GURL origin_url = notification.origin_url();
   DCHECK(origin_url.is_valid());
@@ skipping 24 matching lines @@
       // providers.
 
       // WARNING: You MUST use AddProfileNotification or update the message
       // center via the notification within a ProfileNotification object or the
       // profile ID will not be correctly set for ChromeOS.
       message_center_->UpdateNotification(
           old_id,
           make_scoped_ptr(new message_center::Notification(
               new_notification->notification())));
 
-      new_notification->StartDownloads();
       return true;
     }
   }
   return false;
 }
 
 const Notification* MessageCenterNotificationManager::FindById(
     const std::string& id) const {
   NotificationMap::const_iterator iter = profile_notifications_.find(id);
   if (iter == profile_notifications_.end())
@@ skipping 124 matching lines @@
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_FULLSCREEN_CHANGED) {
     const bool is_fullscreen = *content::Details<bool>(details).ptr();
 
     if (is_fullscreen && tray_.get() && tray_->GetMessageCenterTray())
       tray_->GetMessageCenterTray()->HidePopupBubble();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ImageDownloads
-
-MessageCenterNotificationManager::ImageDownloads::ImageDownloads(
-    message_center::MessageCenter* message_center,
-    ImageDownloadsObserver* observer)
-    : message_center_(message_center),
-      pending_downloads_(0),
-      observer_(observer) {
-}
-
-MessageCenterNotificationManager::ImageDownloads::~ImageDownloads() { }
-
-void MessageCenterNotificationManager::ImageDownloads::StartDownloads(
-    const Notification& notification) {
-  // In case all downloads are synchronous, assume a pending download.
-  AddPendingDownload();
-
-  // Notification image.
-  StartDownloadWithImage(
-      notification,
-      NULL,
-      notification.image_url(),
-      base::Bind(&message_center::MessageCenter::SetNotificationImage,
-                 base::Unretained(message_center_),
-                 notification.delegate_id()));
-
-  // Notification button icons.
-  StartDownloadWithImage(
-      notification,
-      NULL,
-      notification.button_one_icon_url(),
-      base::Bind(&message_center::MessageCenter::SetNotificationButtonIcon,
-                 base::Unretained(message_center_),
-                 notification.delegate_id(),
-                 0));
-  StartDownloadWithImage(
-      notification,
-      NULL,
-      notification.button_two_icon_url(),
-      base::Bind(&message_center::MessageCenter::SetNotificationButtonIcon,
-                 base::Unretained(message_center_),
-                 notification.delegate_id(),
-                 1));
-
-  // This should tell the observer we're done if everything was synchronous.
-  PendingDownloadCompleted();
-}
-
-void MessageCenterNotificationManager::ImageDownloads::StartDownloadWithImage(
-    const Notification& notification,
-    const gfx::Image* image,
-    const GURL& url,
-    const SetImageCallback& callback) {
-  // Set the image directly if we have it.
-  if (image && !image->IsEmpty()) {
-    callback.Run(*image);
-    return;
-  }
-
-  // Leave the image null if there's no URL.
-  if (url.is_empty())
-    return;
-
-  content::WebContents* contents = notification.GetWebContents();
-  if (!contents) {
-    LOG(WARNING) << "Notification needs an image but has no WebContents";
-    return;
-  }
-
-  AddPendingDownload();
-
-  contents->DownloadImage(
-      url,
-      false,  // Not a favicon
-      0,  // No maximum size
-      base::Bind(
-          &MessageCenterNotificationManager::ImageDownloads::DownloadComplete,
-          AsWeakPtr(),
-          callback));
-}
-
-void MessageCenterNotificationManager::ImageDownloads::DownloadComplete(
-    const SetImageCallback& callback,
-    int download_id,
-    int http_status_code,
-    const GURL& image_url,
-    const std::vector<SkBitmap>& bitmaps,
-    const std::vector<gfx::Size>& original_bitmap_sizes) {
-  PendingDownloadCompleted();
-
-  if (bitmaps.empty())
-    return;
-  gfx::Image image = gfx::Image::CreateFrom1xBitmap(bitmaps[0]);
-  callback.Run(image);
-}
-
-// Private methods.
-
-void MessageCenterNotificationManager::ImageDownloads::AddPendingDownload() {
-  ++pending_downloads_;
-}
-
-void
-MessageCenterNotificationManager::ImageDownloads::PendingDownloadCompleted() {
-  DCHECK(pending_downloads_ > 0);
-  if (--pending_downloads_ == 0 && observer_)
-    observer_->OnDownloadsCompleted();
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // ProfileNotification
 
 MessageCenterNotificationManager::ProfileNotification::ProfileNotification(
     Profile* profile,
     const Notification& notification,
     message_center::MessageCenter* message_center)
     : profile_(profile),
-      notification_(notification),
-      downloads_(new ImageDownloads(message_center, this)) {
+      notification_(notification) {
   DCHECK(profile);
 #if defined(OS_CHROMEOS)
   notification_.set_profile_id(multi_user_util::GetUserIDFromProfile(profile));
 #endif
 }
 
 MessageCenterNotificationManager::ProfileNotification::~ProfileNotification() {
 }
 
-void MessageCenterNotificationManager::ProfileNotification::StartDownloads() {
-  downloads_->StartDownloads(notification_);
-}
-
-void
-MessageCenterNotificationManager::ProfileNotification::OnDownloadsCompleted() {
-  notification_.DoneRendering();
-}
-
 void
 MessageCenterNotificationManager::ProfileNotification::AddToAlternateProvider(
     const std::string extension_id) {
   // Convert data from Notification type to NotificationOptions type.
   extensions::api::notifications::NotificationOptions options;
   NotificationConversionHelper::NotificationToNotificationOptions(notification_,
                                                                   &options);
 
   // Send the notification to the alternate provider extension/app.
   extensions::NotificationProviderEventRouter event_router(profile_);
@@ skipping 45 matching lines @@
        it != registry->enabled_extensions().end();
        ++it) {
     if ((*it->get()).permissions_data()->HasAPIPermission(
             extensions::APIPermission::ID::kNotificationProvider)) {
       extension_id = (*it->get()).id();
       return extension_id;
     }
   }
   return extension_id;
 }