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.cc23
1 files changed, 11 insertions, 12 deletions
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index a819ab2..b40b6ff 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -96,9 +96,17 @@ void HistoryUIHTMLSource::StartDataRequest(const std::string& path,
// HistoryHandler
//
////////////////////////////////////////////////////////////////////////////////
-BrowsingHistoryHandler::BrowsingHistoryHandler()
- : search_text_(),
+BrowsingHistoryHandler::BrowsingHistoryHandler(DOMUI* dom_ui)
+ : DOMMessageHandler(dom_ui),
+ search_text_(),
remover_(NULL) {
+ dom_ui_->RegisterMessageCallback("getHistory",
+ NewCallback(this, &BrowsingHistoryHandler::HandleGetHistory));
+ dom_ui_->RegisterMessageCallback("searchHistory",
+ NewCallback(this, &BrowsingHistoryHandler::HandleSearchHistory));
+ dom_ui_->RegisterMessageCallback("deleteDay",
+ NewCallback(this, &BrowsingHistoryHandler::HandleDeleteDay));
+
// Create our favicon data source.
g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
NewRunnableMethod(&chrome_url_data_manager,
@@ -116,15 +124,6 @@ BrowsingHistoryHandler::~BrowsingHistoryHandler() {
remover_->RemoveObserver(this);
}
-void BrowsingHistoryHandler::RegisterMessages() {
- dom_ui_->RegisterMessageCallback("getHistory",
- NewCallback(this, &BrowsingHistoryHandler::HandleGetHistory));
- dom_ui_->RegisterMessageCallback("searchHistory",
- NewCallback(this, &BrowsingHistoryHandler::HandleSearchHistory));
- dom_ui_->RegisterMessageCallback("deleteDay",
- NewCallback(this, &BrowsingHistoryHandler::HandleDeleteDay));
-}
-
void BrowsingHistoryHandler::HandleGetHistory(const Value* value) {
// Anything in-flight is invalid.
cancelable_consumer_.CancelAllRequests();
@@ -357,7 +356,7 @@ void BrowsingHistoryHandler::Observe(NotificationType type,
////////////////////////////////////////////////////////////////////////////////
HistoryUI::HistoryUI(TabContents* contents) : DOMUI(contents) {
- AddMessageHandler((new BrowsingHistoryHandler())->Attach(this));
+ AddMessageHandler(new BrowsingHistoryHandler(this));
HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource();