Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5775)

Unified Diff: chrome/browser/ui/webui/chromeos/register_page_ui.cc

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: nits 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
Index: chrome/browser/ui/webui/chromeos/register_page_ui.cc
===================================================================
--- chrome/browser/ui/webui/chromeos/register_page_ui.cc (revision 176443)
+++ chrome/browser/ui/webui/chromeos/register_page_ui.cc (working copy)
@@ -27,6 +27,7 @@
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/common/cancelable_task_tracker.h"
#include "chrome/common/url_constants.h"
+#include "content/public/browser/url_data_source_delegate.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_message_handler.h"
@@ -95,12 +96,12 @@
} // namespace
-class RegisterPageUIHTMLSource : public ChromeURLDataManager::DataSource {
+class RegisterPageUIHTMLSource : public content::URLDataSourceDelegate {
public:
RegisterPageUIHTMLSource();
- // Called when the network layer has requested a resource underneath
- // the path we registered.
+ // content::URLDataSourceDelegate implementation.
+ virtual std::string GetSource() OVERRIDE;
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id);
@@ -155,10 +156,13 @@
//
////////////////////////////////////////////////////////////////////////////////
-RegisterPageUIHTMLSource::RegisterPageUIHTMLSource()
- : DataSource(chrome::kChromeUIRegisterPageHost, MessageLoop::current()) {
+RegisterPageUIHTMLSource::RegisterPageUIHTMLSource() {
}
+std::string RegisterPageUIHTMLSource::GetSource() {
+ return chrome::kChromeUIRegisterPageHost;
+}
+
void RegisterPageUIHTMLSource::StartDataRequest(const std::string& path,
bool is_incognito,
int request_id) {
@@ -167,7 +171,7 @@
if (!chromeos::WizardController::default_controller() ||
chromeos::WizardController::IsDeviceRegistered()) {
scoped_refptr<base::RefCountedBytes> empty_bytes(new base::RefCountedBytes);
- SendResponse(request_id, empty_bytes);
+ url_data_source()->SendResponse(request_id, empty_bytes);
return;
}
@@ -175,7 +179,7 @@
ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
IDR_HOST_REGISTRATION_PAGE_HTML));
- SendResponse(request_id, html_bytes);
+ url_data_source()->SendResponse(request_id, html_bytes);
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698