| Index: chrome/browser/dom_ui/history_ui.cc
|
| ===================================================================
|
| --- chrome/browser/dom_ui/history_ui.cc (revision 19317)
|
| +++ chrome/browser/dom_ui/history_ui.cc (working copy)
|
| @@ -96,17 +96,9 @@
|
| // HistoryHandler
|
| //
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -BrowsingHistoryHandler::BrowsingHistoryHandler(DOMUI* dom_ui)
|
| - : DOMMessageHandler(dom_ui),
|
| - search_text_(),
|
| +BrowsingHistoryHandler::BrowsingHistoryHandler()
|
| + : 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,
|
| @@ -124,6 +116,15 @@
|
| 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();
|
| @@ -356,7 +357,7 @@
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|
| HistoryUI::HistoryUI(TabContents* contents) : DOMUI(contents) {
|
| - AddMessageHandler(new BrowsingHistoryHandler(this));
|
| + AddMessageHandler((new BrowsingHistoryHandler())->Attach(this));
|
|
|
| HistoryUIHTMLSource* html_source = new HistoryUIHTMLSource();
|
|
|
|
|