chrome/browser/ui/webui/chrome_web_ui_data_source.h - Issue 11885021: Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele…

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_data_source.h

Issue 11885021: Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix WebUISourcesTest unittest Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/webui/chrome_url_data_manager_backend.h ('K') | « chrome/browser/ui/webui/chrome_url_data_manager_backend.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_data_source.cc » ('j') | chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_data_source.h

===================================================================

--- chrome/browser/ui/webui/chrome_web_ui_data_source.h (revision 176443)

+++ chrome/browser/ui/webui/chrome_web_ui_data_source.h (working copy)

@@ -11,14 +11,15 @@

#include "base/basictypes.h"

#include "base/callback.h"

#include "base/compiler_specific.h"

-#include "base/message_loop.h"

#include "base/values.h"

#include "chrome/browser/ui/webui/chrome_url_data_manager.h"

+#include "content/public/browser/url_data_source_delegate.h"

// A data source that can help with implementing the common operations

// needed by the chrome WEBUI settings/history/downloads pages.

// DO NOT DERIVE FROM THIS CLASS! http://crbug.com/169170

-class ChromeWebUIDataSource : public ChromeURLDataManager::DataSource {

+class ChromeWebUIDataSource : public URLDataSource,

+ public content::URLDataSourceDelegate {

public:

// Used as a parameter to GotDataCallback. The caller has to run this callback

// with the result for the path that they filtered, passing ownership of the

@@ -32,8 +33,7 @@

typedef base::Callback<bool(const std::string&, const GotDataCallback&)>

HandleRequestCallback;

- explicit ChromeWebUIDataSource(const std::string& source_name);

- ChromeWebUIDataSource(const std::string& source_name, MessageLoop* loop);

+ explicit ChromeWebUIDataSource(const std::string& source_name);;

// Adds a string keyed to its name to our dictionary.

void AddString(const std::string& name, const string16& value);

@@ -82,13 +82,15 @@

// Completes a request by sending the file specified by |idr|.

void SendFromResourceBundle(int request_id, int idr);

- // ChromeURLDataManager

+ // content::URLDataSourceDelegate implementation:

James Hawkins 2013/01/14 18:53:54 webui/ files use: // content::URLDataSourceDelega

jam 2013/01/14 19:21:18 Done.

+ virtual std::string GetSource() OVERRIDE;

virtual std::string GetMimeType(const std::string& path) const OVERRIDE;

virtual void StartDataRequest(const std::string& path,

bool is_incognito,

int request_id) OVERRIDE;

private:

+ std::string source_name_;

James Hawkins 2013/01/14 18:53:54 nit: Document member variable. Yes, none of the o

jam 2013/01/14 19:21:18 Done.

int default_resource_;

bool json_js_format_v2_;

std::string json_path_;