Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa…

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"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "grit/locale_settings.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
+FaviconSource::IconRequest::IconRequest()
+    : request_path(""),

[Evan Stade, 2013/01/15 20:49:34]

why is this necessary?

[jam, 2013/01/15 21:09:08]

I had moved this from the header, i'll take this out

+      size_in_dip(gfx::kFaviconSize),
+      scale_factor(ui::SCALE_FACTOR_NONE) {
+}
+
+FaviconSource::IconRequest::IconRequest(
+    const content::URLDataSource::GotDataCallback& cb,
+    const std::string& path,
+    int size,
+    ui::ScaleFactor scale)
+    : callback(cb),
+      request_path(path),
+      size_in_dip(size),
+      scale_factor(scale) {
+}
+
+FaviconSource::IconRequest::~IconRequest() {
+}
+
 FaviconSource::FaviconSource(Profile* profile, IconType type)
     : profile_(profile->GetOriginalProfile()),
       icon_types_(type == FAVICON ? history::FAVICON :
           history::TOUCH_PRECOMPOSED_ICON | history::TOUCH_ICON |
           history::FAVICON) {
 }
 
 FaviconSource::~FaviconSource() {
 }
 
 std::string FaviconSource::GetSource() {
   return icon_types_ == history::FAVICON ?
       chrome::kChromeUIFaviconHost : chrome::kChromeUITouchIconHost;
 }
 
-void FaviconSource::StartDataRequest(const std::string& path,
-                                     bool is_incognito,
-                                     int request_id) {
+void FaviconSource::StartDataRequest(
+    const std::string& path,
+    bool is_incognito,
+    const content::URLDataSource::GotDataCallback& callback) {
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service || path.empty()) {
-    SendDefaultResponse(IconRequest(request_id,
+    SendDefaultResponse(IconRequest(callback,
                                     "",
                                     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,
+                   IconRequest(callback,
                                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);
@@ skipping 26 matching lines @@
         url = GURL(originalUrl).GetOrigin();
       } else {
         url = GURL(path);
       }
     }
 
     // Intercept requests for prepopulated pages.
     for (size_t i = 0; i < arraysize(history::kPrepopulatedPages); i++) {
       if (url.spec() ==
           l10n_util::GetStringUTF8(history::kPrepopulatedPages[i].url_id)) {
-        url_data_source()->SendResponse(request_id,
+        callback.Run(
             ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
                 history::kPrepopulatedPages[i].favicon_id,
                 scale_factor));
         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,
+                   IconRequest(callback,
                                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.
@@ skipping 10 matching lines @@
   // 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.
-    url_data_source()->SendResponse(
-        request.request_id, bitmap_result.bitmap_data);
+    request.callback.Run(bitmap_result.bitmap_data);
   } 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:
@@ skipping 11 matching lines @@
   }
   base::RefCountedMemory* default_favicon = default_favicons_[favicon_index];
 
   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;
   }
 
-  url_data_source()->SendResponse(icon_request.request_id, default_favicon);
+  icon_request.callback.Run(default_favicon);
 }