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

chrome/browser/ui/webui/theme_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/theme_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/resources_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 
@@ skipping 21 matching lines @@
       profile->IsOffTheRecord());
 }
 
 ThemeSource::~ThemeSource() {
 }
 
 std::string ThemeSource::GetSource() {
   return chrome::kChromeUIThemePath;
 }
 
-void ThemeSource::StartDataRequest(const std::string& path,
-                                   bool is_incognito,
-                                   int request_id) {
+void ThemeSource::StartDataRequest(
+    const std::string& path,
+    bool is_incognito,
+    const content::URLDataSource::GotDataCallback& callback) {
   // Default scale factor if not specified.
   ui::ScaleFactor scale_factor;
   std::string uncached_path;
   web_ui_util::ParsePathAndScale(GURL(GetThemePath() + path),
                                  &uncached_path,
                                  &scale_factor);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     DCHECK((uncached_path == kNewTabCSSPath && !is_incognito) ||
            (uncached_path == kNewIncognitoTabCSSPath && is_incognito));
 
-    url_data_source()->SendResponse(request_id, css_bytes_);
+    callback.Run(css_bytes_);
     return;
   }
 
 
   int resource_id = ResourcesUtil::GetThemeResourceId(uncached_path);
   if (resource_id != -1) {
-    SendThemeBitmap(request_id, resource_id, scale_factor);
+    SendThemeBitmap(callback, resource_id, scale_factor);
     return;
   }
 
   // We don't have any data to send back.
-  url_data_source()->SendResponse(request_id, NULL);
+  callback.Run(NULL);
 }
 
 std::string ThemeSource::GetMimeType(const std::string& path) const {
   std::string uncached_path;
   web_ui_util::ParsePathAndScale(GURL(GetThemePath() + path),
                                  &uncached_path, NULL);
 
   if (uncached_path == kNewTabCSSPath ||
       uncached_path == kNewIncognitoTabCSSPath) {
     return "text/css";
@@ skipping 13 matching lines @@
     // We generated and cached this when we initialized the object.  We don't
     // have to go back to the UI thread to send the data.
     return NULL;
   }
 
   // If it's not a themeable image, we don't need to go to the UI thread.
   int resource_id = ResourcesUtil::GetThemeResourceId(uncached_path);
   if (!ThemeService::IsThemeableImage(resource_id))
     return NULL;
 
-  return content::URLDataSourceDelegate::MessageLoopForRequestPath(path);
+  return content::URLDataSource::MessageLoopForRequestPath(path);
 }
 
 bool ThemeSource::ShouldReplaceExistingSource() const {
   // We currently get the css_bytes_ in the ThemeSource constructor, so we need
   // to recreate the source itself when a theme changes.
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ThemeSource, private:
 
-void ThemeSource::SendThemeBitmap(int request_id,
-                                  int resource_id,
-                                  ui::ScaleFactor scale_factor) {
+void ThemeSource::SendThemeBitmap(
+    const content::URLDataSource::GotDataCallback& callback,
+    int resource_id,
+    ui::ScaleFactor scale_factor) {
   if (ThemeService::IsThemeableImage(resource_id)) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
     DCHECK(tp);
 
     scoped_refptr<base::RefCountedMemory> image_data(tp->GetRawData(
         resource_id, scale_factor));
-    url_data_source()->SendResponse(request_id, image_data);
+    callback.Run(image_data);
   } else {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    url_data_source()->SendResponse(
-        request_id,
-        rb.LoadDataResourceBytesForScale(resource_id, scale_factor));
+    callback.Run(rb.LoadDataResourceBytesForScale(resource_id, scale_factor));
   }
 }