Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele…

chrome/browser/ui/webui/bookmarks_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/bookmarks_ui.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BookmarksUIHTMLSource
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-BookmarksUIHTMLSource::BookmarksUIHTMLSource()
-    : DataSource(chrome::kChromeUIBookmarksHost, MessageLoop::current()) {
+BookmarksUIHTMLSource::BookmarksUIHTMLSource() {
+}
+
+std::string BookmarksUIHTMLSource::GetSource() {
+  return chrome::kChromeUIBookmarksHost;
 }
 
 void BookmarksUIHTMLSource::StartDataRequest(const std::string& path,
                                              bool is_incognito,
                                              int request_id) {
   NOTREACHED() << "We should never get here since the extension should have"
                << "been triggered";
 
-  SendResponse(request_id, NULL);
+  url_data_source()->SendResponse(request_id, NULL);
 }
 
 std::string BookmarksUIHTMLSource::GetMimeType(const std::string& path) const {
   NOTREACHED() << "We should never get here since the extension should have"
                << "been triggered";
   return "text/html";
 }
 
 BookmarksUIHTMLSource::~BookmarksUIHTMLSource() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BookmarksUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 BookmarksUI::BookmarksUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   BookmarksUIHTMLSource* html_source = new BookmarksUIHTMLSource();
-
   // Set up the chrome://bookmarks/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, html_source);
+  ChromeURLDataManager::AddDataSource(
+      Profile::FromWebUI(web_ui),
+      new BookmarksUIHTMLSource);
 }

[tfarina, 2013/01/14 20:49:11]

wait, something is crazy going on here.


Isn't:

ChromeURLDataManager::AddDataSource(Profile::FromWebUI(web_ui), new
BookmarksUIHTMLSource);

The same of:

BookmarksUIHTMLSource* html_source = new BookmarksUIHTMLSource();
Profile* profile = Profile::FromWebUI(web_ui);
ChromeURLDataManager::AddDataSource(profile, html_source);

?

If I'm not seeing this wrong, you are doing the same thing twice here.

[jam, 2013/01/14 20:52:07]

ah, thanks. i had changed it while doing another change that i later undid, and
now i went back to make the formatting the same but forgot to remove this. will
commit in a followup

 
 // static
 base::RefCountedMemory* BookmarksUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return ui::ResourceBundle::GetSharedInstance().
       LoadDataResourceBytesForScale(IDR_BOOKMARKS_FAVICON, scale_factor);
 }