diff options
| -rw-r--r-- | chrome/browser/dom_ui/history_ui.cc | 19 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/history_ui.h | 7 | ||||
| -rw-r--r-- | chrome/browser/resources/history.html | 1 |
3 files changed, 14 insertions, 13 deletions
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 055aac9..c107227 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -114,7 +114,8 @@ BrowsingHistoryHandler::BrowsingHistoryHandler() } BrowsingHistoryHandler::~BrowsingHistoryHandler() { - cancelable_consumer_.CancelAllRequests(); + cancelable_search_consumer_.CancelAllRequests(); + cancelable_delete_consumer_.CancelAllRequests(); } DOMMessageHandler* BrowsingHistoryHandler::Attach(DOMUI* dom_ui) { @@ -145,7 +146,7 @@ void BrowsingHistoryHandler::RegisterMessages() { void BrowsingHistoryHandler::HandleGetHistory(const Value* value) { // Anything in-flight is invalid. - cancelable_consumer_.CancelAllRequests(); + cancelable_search_consumer_.CancelAllRequests(); // Get arguments (if any). int day = 0; @@ -165,13 +166,13 @@ void BrowsingHistoryHandler::HandleGetHistory(const Value* value) { dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->QueryHistory(search_text_, options, - &cancelable_consumer_, + &cancelable_search_consumer_, NewCallback(this, &BrowsingHistoryHandler::QueryComplete)); } void BrowsingHistoryHandler::HandleSearchHistory(const Value* value) { // Anything in-flight is invalid. - cancelable_consumer_.CancelAllRequests(); + cancelable_search_consumer_.CancelAllRequests(); // Get arguments (if any). int month = 0; @@ -190,12 +191,12 @@ void BrowsingHistoryHandler::HandleSearchHistory(const Value* value) { dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); hs->QueryHistory(search_text_, options, - &cancelable_consumer_, + &cancelable_search_consumer_, NewCallback(this, &BrowsingHistoryHandler::QueryComplete)); } void BrowsingHistoryHandler::HandleRemoveURLsOnOneDay(const Value* value) { - if (cancelable_consumer_.HasPendingRequests()) { + if (cancelable_delete_consumer_.HasPendingRequests()) { dom_ui_->CallJavascriptFunction(L"deleteFailed"); return; } @@ -228,14 +229,12 @@ void BrowsingHistoryHandler::HandleRemoveURLsOnOneDay(const Value* value) { HistoryService* hs = dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS); - hs->ExpireHistoryBetween(urls, begin_time, end_time, &cancelable_consumer_, + hs->ExpireHistoryBetween( + urls, begin_time, end_time, &cancelable_delete_consumer_, NewCallback(this, &BrowsingHistoryHandler::RemoveComplete)); } void BrowsingHistoryHandler::HandleClearBrowsingData(const Value* value) { - // Anything in-flight is invalid. - cancelable_consumer_.CancelAllRequests(); - dom_ui_->tab_contents()->delegate()->GetBrowser()-> OpenClearBrowsingDataDialog(); } diff --git a/chrome/browser/dom_ui/history_ui.h b/chrome/browser/dom_ui/history_ui.h index a8fceb3..8adb691 100644 --- a/chrome/browser/dom_ui/history_ui.h +++ b/chrome/browser/dom_ui/history_ui.h @@ -84,8 +84,11 @@ class BrowsingHistoryHandler : public DOMMessageHandler, // Current search text. std::wstring search_text_; - // Our consumer for the history service. - CancelableRequestConsumerT<int, 0> cancelable_consumer_; + // Our consumer for search requests to the history service. + CancelableRequestConsumerT<int, 0> cancelable_search_consumer_; + + // Our consumer for delete requests to the history service. + CancelableRequestConsumerT<int, 0> cancelable_delete_consumer_; DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler); }; diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html index ac12b78..69e99a7 100644 --- a/chrome/browser/resources/history.html +++ b/chrome/browser/resources/history.html @@ -1026,7 +1026,6 @@ function deleteComplete() { deleteNextInQueue(); } else { deleteQueue = []; - historyView.reload(); } } |