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

Unified Diff: chrome/browser/ui/webui/ntp/new_tab_ui.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: 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/ntp/new_tab_ui.h
===================================================================
--- chrome/browser/ui/webui/ntp/new_tab_ui.h (revision 176443)
+++ chrome/browser/ui/webui/ntp/new_tab_ui.h (working copy)
@@ -13,7 +13,7 @@
#include "base/time.h"
#include "base/timer.h"
#include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "content/public/browser/url_data_source_delegate.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_ui_controller.h"
@@ -22,6 +22,10 @@
class PrefServiceSyncable;
class Profile;
+namespace base {
+class DictionaryValue;
+}
+
// The WebContents used for the New Tab page.
class NewTabUI : public content::WebUIController,
public content::NotificationObserver {
@@ -63,18 +67,16 @@
bool showing_sync_bubble() { return showing_sync_bubble_; }
void set_showing_sync_bubble(bool showing) { showing_sync_bubble_ = showing; }
- class NewTabHTMLSource : public ChromeURLDataManager::DataSource {
+ class NewTabHTMLSource : public content::URLDataSourceDelegate {
public:
explicit NewTabHTMLSource(Profile* profile);
- // 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) OVERRIDE;
-
virtual std::string GetMimeType(const std::string&) const OVERRIDE;
-
virtual bool ShouldReplaceExistingSource() const OVERRIDE;
// Adds |resource| to the source. |resource_id| is resource id or 0,

Powered by Google App Engine
This is Rietveld 408576698