diff options
author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
---|---|---|
committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /chrome/browser/dom_ui/history2_ui.cc | |
parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'chrome/browser/dom_ui/history2_ui.cc')
-rw-r--r-- | chrome/browser/dom_ui/history2_ui.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc index f2107a1..383cae3 100644 --- a/chrome/browser/dom_ui/history2_ui.cc +++ b/chrome/browser/dom_ui/history2_ui.cc @@ -20,7 +20,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/chrome_thread.h" +#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/history/history_types.h" @@ -123,8 +123,8 @@ BrowsingHistoryHandler2::~BrowsingHistoryHandler2() { DOMMessageHandler* BrowsingHistoryHandler2::Attach(DOMUI* dom_ui) { // Create our favicon data source. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( Singleton<ChromeURLDataManager>::get(), &ChromeURLDataManager::AddDataSource, @@ -395,8 +395,8 @@ HistoryUI2::HistoryUI2(TabContents* contents) : DOMUI(contents) { HistoryUIHTMLSource2* html_source = new HistoryUIHTMLSource2(); // Set up the chrome://history2/ source. - ChromeThread::PostTask( - ChromeThread::IO, FROM_HERE, + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, NewRunnableMethod( Singleton<ChromeURLDataManager>::get(), &ChromeURLDataManager::AddDataSource, |