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

chrome/browser/ui/webui/chromeos/system_info_ui.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/chromeos/system_info_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/system_logs/system_logs_fetcher.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/chrome_paths.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/browser/url_data_source_delegate.h"
+#include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/directory_lister.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace chromeos {
 
-class SystemInfoUIHTMLSource : public content::URLDataSourceDelegate {
+class SystemInfoUIHTMLSource : public content::URLDataSource{
  public:
   SystemInfoUIHTMLSource();
 
-  // content::URLDataSourceDelegate implementation.
+  // content::URLDataSource implementation.
   virtual std::string GetSource() OVERRIDE;
-  virtual void StartDataRequest(const std::string& path,
-                                bool is_incognito,
-                                int request_id) OVERRIDE;
+  virtual void StartDataRequest(
+      const std::string& path,
+      bool is_incognito,
+      const content::URLDataSource::GotDataCallback& callback) OVERRIDE;
   virtual std::string GetMimeType(const std::string&) const OVERRIDE {
     return "text/html";
   }
 
  private:
   ~SystemInfoUIHTMLSource() {}
 
   void SysInfoComplete(scoped_ptr<SystemLogsResponse> response);
   void RequestComplete();
   void WaitForData();
 
   // Stored data from StartDataRequest()
   std::string path_;
-  int request_id_;
+  content::URLDataSource::GotDataCallback callback_;
 
   scoped_ptr<SystemLogsResponse> response_;
   base::WeakPtrFactory<SystemInfoUIHTMLSource> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(SystemInfoUIHTMLSource);
 };
 
 // The handler for Javascript messages related to the "system" view.
 class SystemInfoHandler : public WebUIMessageHandler,
                           public base::SupportsWeakPtr<SystemInfoHandler> {
  public:
   SystemInfoHandler();
   virtual ~SystemInfoHandler();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemInfoHandler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // SystemInfoUIHTMLSource
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 SystemInfoUIHTMLSource::SystemInfoUIHTMLSource()
-    : request_id_(0),
-      response_(NULL),
+    : response_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
 std::string SystemInfoUIHTMLSource::GetSource() {
   return chrome::kChromeUISystemInfoHost;
 }
 
-void SystemInfoUIHTMLSource::StartDataRequest(const std::string& path,
-                                              bool is_incognito,
-                                              int request_id) {
+void SystemInfoUIHTMLSource::StartDataRequest(
+    const std::string& path,
+    bool is_incognito,
+    const content::URLDataSource::GotDataCallback& callback) {
   path_ = path;
-  request_id_ = request_id;
+  callback_ = callback;
 
   SystemLogsFetcher* fetcher = new SystemLogsFetcher();
   fetcher->Fetch(base::Bind(&SystemInfoUIHTMLSource::SysInfoComplete,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 
 void SystemInfoUIHTMLSource::SysInfoComplete(
     scoped_ptr<SystemLogsResponse> sys_info) {
   response_ = sys_info.Pass();
   RequestComplete();
 }
 
 void SystemInfoUIHTMLSource::RequestComplete() {
   DictionaryValue strings;
   strings.SetString("title", l10n_util::GetStringUTF16(IDS_ABOUT_SYS_TITLE));
   strings.SetString("description",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_DESC));
   strings.SetString("table_title",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_TABLE_TITLE));
   strings.SetString("expand_all_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND_ALL));
   strings.SetString("collapse_all_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE_ALL));
   strings.SetString("expand_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_EXPAND));
   strings.SetString("collapse_btn",
                     l10n_util::GetStringUTF16(IDS_ABOUT_SYS_COLLAPSE));
-  URLDataSource::SetFontAndTextDirection(&strings);
+  web_ui_util::SetFontAndTextDirection(&strings);
   if (response_.get()) {
     ListValue* details = new ListValue();
     strings.Set("details", details);
     for (SystemLogsResponse::const_iterator it = response_->begin();
          it != response_->end();
          ++it) {
       DictionaryValue* val = new DictionaryValue;
       val->SetString("stat_name", it->first);
       val->SetString("stat_value", it->second);
       details->Append(val);
     }
     strings.SetString("anchor", path_);
   }
   static const base::StringPiece systeminfo_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_ABOUT_SYS_HTML));
   std::string full_html = jstemplate_builder::GetTemplatesHtml(
       systeminfo_html, &strings, "t" /* template root node id */);
-  url_data_source()->SendResponse(
-      request_id_, base::RefCountedString::TakeString(&full_html));
+  callback.Run(base::RefCountedString::TakeString(&full_html));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // SystemInfoHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 SystemInfoHandler::SystemInfoHandler() {
 }
 
@@ skipping 14 matching lines @@
   SystemInfoHandler* handler = new SystemInfoHandler();
   web_ui->AddMessageHandler(handler);
   SystemInfoUIHTMLSource* html_source = new SystemInfoUIHTMLSource();
 
   // Set up the chrome://system/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, html_source);
 }
 
 }  // namespace chromeos