Most visited thumbnails and favicons need id-based urls

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 "base/strings/string_number_conversions.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/instant/instant_io_context.h"
+#include "chrome/browser/instant/instant_service.h"
+#include "chrome/browser/instant/instant_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "grit/locale_settings.h"
 #include "grit/ui_resources.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/web_ui_util.h"
 
@@ skipping 50 matching lines @@
 
 FaviconSource::~FaviconSource() {
 }
 
 std::string FaviconSource::GetSource() {
   return icon_types_ == history::FAVICON ?
       chrome::kChromeUIFaviconHost : chrome::kChromeUITouchIconHost;
 }
 
 void FaviconSource::StartDataRequest(
-    const std::string& path,
+    const std::string& raw_path,
     bool is_incognito,
     const content::URLDataSource::GotDataCallback& callback) {
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (!favicon_service || path.empty()) {
+  if (!favicon_service || raw_path.empty()) {
     SendDefaultResponse(callback);
     return;
   }
 
+  // Translate to regular path if |raw_path| is of the form
+  // chrome-search://favicon/<rid>, where rid is a uint64.
+  std::string path = InstantService::MaybeTranslateInstantPath(profile_,
+                                                               raw_path);

[palmer, 2013/03/11 20:42:31]

NIT: This might all fit on one line?

[dhollowa, 2013/03/11 23:27:59]

Not quite, no.

+
   DCHECK_EQ(16, gfx::kFaviconSize);
   int size_in_dip = 16;
   ui::ScaleFactor scale_factor = ui::SCALE_FACTOR_100P;
 
   size_t parsed_index = 0;
   if (HasSubstringAt(path, parsed_index, kLargestParameter)) {
     parsed_index += strlen(kLargestParameter);
     size_in_dip = 0;
   } else if (HasSubstringAt(path, parsed_index, kSizeParameter)) {
     parsed_index += strlen(kSizeParameter);
@@ skipping 109 matching lines @@
   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::ShouldServiceRequest(const net::URLRequest* request) const {
-  if (request->url().SchemeIs(chrome::kChromeSearchScheme))
-    return InstantIOContext::ShouldServiceRequest(request);
+  if (request->url().SchemeIs(chrome::kChromeSearchScheme)) {
+    return InstantService::IsInstantPath(request->url()) &&
+        InstantIOContext::ShouldServiceRequest(request);
+  }
   return URLDataSource::ShouldServiceRequest(request);
 }
 
 bool FaviconSource::HandleMissingResource(const IconRequest& request) {
   // No additional checks to locate the favicon resource in the base
   // implementation.
   return false;
 }
 
 void FaviconSource::OnFaviconDataAvailable(
@@ skipping 36 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;
   }
 
   icon_request.callback.Run(default_favicon);
 }