| Index: chrome/browser/ui/webui/bookmarks_ui.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/bookmarks_ui.cc (revision 176942)
|
| +++ chrome/browser/ui/webui/bookmarks_ui.cc (working copy)
|
| @@ -7,7 +7,6 @@
|
| #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"
|
| @@ -26,13 +25,14 @@
|
| return chrome::kChromeUIBookmarksHost;
|
| }
|
|
|
| -void BookmarksUIHTMLSource::StartDataRequest(const std::string& path,
|
| - bool is_incognito,
|
| - int request_id) {
|
| +void BookmarksUIHTMLSource::StartDataRequest(
|
| + const std::string& path,
|
| + bool is_incognito,
|
| + const content::URLDataSource::GotDataCallback& callback) {
|
| NOTREACHED() << "We should never get here since the extension should have"
|
| << "been triggered";
|
|
|
| - url_data_source()->SendResponse(request_id, NULL);
|
| + callback.Run(NULL);
|
| }
|
|
|
| std::string BookmarksUIHTMLSource::GetMimeType(const std::string& path) const {
|
|
|