Fix Notifications Icon loading.

content/renderer/favicon_helper.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 "content/renderer/favicon_helper.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "content/common/icon_messages.h"
+#include "content/public/common/content_constants.h"
 #include "content/public/renderer/render_view.h"
 #include "net/base/data_url.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
@@ skipping 57 matching lines @@
                               ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(routing_id(), render_view()->GetPageId(), urls);
 }
 
 FaviconHelper::~FaviconHelper() {
 }
 
 void FaviconHelper::OnDownloadFavicon(int id,
                                       const GURL& image_url,
+                                      DownloadImageType image_type,
                                       int image_size) {
   std::vector<SkBitmap> result_images;
   if (image_url.SchemeIs("data")) {
     SkBitmap data_image = ImageFromDataUrl(image_url);
     if (!data_image.empty())
       result_images.push_back(data_image);
   } else {
-    if (DownloadFavicon(id, image_url, image_size)) {
+    if (DownloadFavicon(id, image_url, image_type, image_size)) {
       // Will complete asynchronously via FaviconHelper::DidDownloadFavicon
       return;
     }
   }
 
   Send(new IconHostMsg_DidDownloadFavicon(routing_id(),
                                           id,
                                           image_url,
                                           image_size,
                                           result_images));
 }
 
 bool FaviconHelper::DownloadFavicon(int id,
                                     const GURL& image_url,
+                                    DownloadImageType image_type,
                                     int image_size) {
   // Make sure webview was not shut down.
   if (!render_view()->GetWebView())
     return false;
   // Create an image resource fetcher and assign it with a call back object.
+  WebURLRequest::TargetType target_type;
+  switch (image_type) {
+    case DOWNLOAD_FAVICON:
+      target_type = WebURLRequest::TargetIsFavicon;
+      break;
+    case DOWNLOAD_OTHER:
+      target_type = WebURLRequest::TargetIsImage;
+      break;
+    default:
+      NOTREACHED();
+  }
+
   image_fetchers_.push_back(new MultiResolutionImageResourceFetcher(
-      image_url, render_view()->GetWebView()->mainFrame(), id,
-      WebURLRequest::TargetIsFavicon,
+      image_url,
+      render_view()->GetWebView()->mainFrame(),
+      id,
+      target_type,
       base::Bind(&FaviconHelper::DidDownloadFavicon,
                  base::Unretained(this), image_size)));
   return true;
 }
 
 void FaviconHelper::DidDownloadFavicon(
     int requested_size,
     MultiResolutionImageResourceFetcher* fetcher,
     const std::vector<SkBitmap>& images) {
   // Notify requester of image download status.
@@ skipping 54 matching lines @@
   std::vector<FaviconURL> urls;
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url, ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(routing_id(), render_view()->GetPageId(), urls);
 }
 
 }  // namespace content