Make favicons for about:history and about:bookmarks switch from lodpi to hidpi when dragging browser

chrome/browser/ui/webui/favicon_source.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/ui/webui/favicon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
@@ skipping 29 matching lines @@
       history::TOUCH_PRECOMPOSED_ICON | history::TOUCH_ICON |
       history::FAVICON;
 }
 
 void FaviconSource::StartDataRequest(const std::string& path,
                                      bool is_incognito,
                                      int request_id) {
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service || path.empty()) {
-    SendDefaultResponse(IconRequest(request_id, 16, ui::SCALE_FACTOR_100P));
+    SendDefaultResponse(IconRequest(request_id,
+                                    "",
+                                    16,
+                                    ui::SCALE_FACTOR_100P));
     return;
   }
 
   int size_in_dip = gfx::kFaviconSize;
   ui::ScaleFactor scale_factor = ui::SCALE_FACTOR_100P;
 
   if (path.size() > 8 &&
       (path.substr(0, 8) == "iconurl/" || path.substr(0, 8) == "iconurl@")) {
     size_t prefix_length = 8;
     // Optional scale factor appended to iconurl, which may be @1x or @2x.
     if (path.at(7) == '@') {
         size_t slash = path.find("/");
         std::string scale_str = path.substr(8, slash - 8);
         web_ui_util::ParseScaleFactor(scale_str, &scale_factor);
         prefix_length = slash + 1;
     }
     // TODO(michaelbai): Change GetRawFavicon to support combination of
     // IconType.
     favicon_service->GetRawFavicon(
         GURL(path.substr(prefix_length)),
         history::FAVICON,
         size_in_dip,
         scale_factor,
         base::Bind(&FaviconSource::OnFaviconDataAvailable,
                    base::Unretained(this),
-                   IconRequest(request_id, size_in_dip, scale_factor)),
+                   IconRequest(request_id,
+                               path.substr(prefix_length),
+                               size_in_dip,
+                               scale_factor)),
         &cancelable_task_tracker_);
   } else {
     GURL url;
     if (path.size() > 5 && path.substr(0, 5) == "size/") {
       size_t slash = path.find("/", 5);
       size_t scale_delimiter = path.find("@", 5);
       std::string size = path.substr(5, slash - 5);
       size_in_dip = atoi(size.c_str());
       if (size_in_dip != 64 && size_in_dip != 32 && size_in_dip != 16) {
         // Only 64x64, 32x32 and 16x16 icons are supported.
@@ skipping 37 matching lines @@
         return;
       }
     }
 
     favicon_service->GetRawFaviconForURL(
         FaviconService::FaviconForURLParams(
             profile_, url, icon_types_, size_in_dip),
         scale_factor,
         base::Bind(&FaviconSource::OnFaviconDataAvailable,
                    base::Unretained(this),
-                   IconRequest(request_id, size_in_dip, scale_factor)),
+                   IconRequest(request_id,
+                               url.spec(),
+                               size_in_dip,
+                               scale_factor)),
         &cancelable_task_tracker_);
   }
 }
 
 std::string FaviconSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 bool FaviconSource::ShouldReplaceExistingSource() const {
   // Leave the existing DataSource in place, otherwise we'll drop any pending
   // requests on the floor.
   return false;
 }
 
+bool FaviconSource::HandleMissingResource(const IconRequest& request) {
+  // No additional checks to locate the favicon resource in the base
+  // implementation.
+  return false;
+}
+
 void FaviconSource::OnFaviconDataAvailable(
     const IconRequest& request,
     const history::FaviconBitmapResult& bitmap_result) {
   if (bitmap_result.is_valid()) {
     // Forward the data along to the networking system.
     SendResponse(request.request_id, bitmap_result.bitmap_data);
-  } else {
+  } else if (!HandleMissingResource(request)) {
     SendDefaultResponse(request);
   }
 }
 
 void FaviconSource::SendDefaultResponse(const IconRequest& icon_request) {
   int favicon_index;
   int resource_id;
   switch (icon_request.size_in_dip) {
     case 64:
       favicon_index = SIZE_64;
@@ skipping 12 matching lines @@
 
   if (!default_favicon) {
     ui::ScaleFactor scale_factor = icon_request.scale_factor;
     default_favicon = ResourceBundle::GetSharedInstance()
         .LoadDataResourceBytesForScale(resource_id, scale_factor);
     default_favicons_[favicon_index] = default_favicon;
   }
 
   SendResponse(icon_request.request_id, default_favicon);
 }