summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui/history_ui.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/dom_ui/history_ui.cc')
-rw-r--r--chrome/browser/dom_ui/history_ui.cc18
1 files changed, 13 insertions, 5 deletions
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index 80be7d3..2013256 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -129,13 +129,16 @@ BrowsingHistoryHandler::~BrowsingHistoryHandler() {
WebUIMessageHandler* BrowsingHistoryHandler::Attach(DOMUI* dom_ui) {
// Create our favicon data source.
- Profile* profile = dom_ui->GetProfile();
- profile->GetChromeURLDataManager()->AddDataSource(
- new WebUIFavIconSource(profile));
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ NewRunnableMethod(
+ ChromeURLDataManager::GetInstance(),
+ &ChromeURLDataManager::AddDataSource,
+ make_scoped_refptr(new WebUIFavIconSource(dom_ui->GetProfile()))));
// Get notifications when history is cleared.
registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
- Source<Profile>(profile->GetOriginalProfile()));
+ Source<Profile>(dom_ui->GetProfile()->GetOriginalProfile()));
return WebUIMessageHandler::Attach(dom_ui);
}
@@ -385,7 +388,12 @@ HistoryUI::HistoryUI(TabContents* contents) : DOMUI(contents) {
HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource();
// Set up the chrome://history/ source.
- contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ NewRunnableMethod(
+ ChromeURLDataManager::GetInstance(),
+ &ChromeURLDataManager::AddDataSource,
+ make_scoped_refptr(html_source)));
}
// static