Index: chrome/browser/history/history_backend.cc |
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc |
index e64dbc616432380f9b112bfff9ce986913d64b20..21047164b4ba8ba82b1984e90a5b8751841d21df 100644 |
--- a/chrome/browser/history/history_backend.cc |
+++ b/chrome/browser/history/history_backend.cc |
@@ -23,6 +23,7 @@ |
#include "chrome/browser/api/bookmarks/bookmark_service.h" |
#include "chrome/browser/autocomplete/history_url_provider.h" |
#include "chrome/browser/common/cancelable_request.h" |
+#include "chrome/browser/history/download_persistent_store_info.h" |
#include "chrome/browser/history/history_notifications.h" |
#include "chrome/browser/history/history_publisher.h" |
#include "chrome/browser/history/in_memory_history_backend.h" |
@@ -33,7 +34,6 @@ |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_notification_types.h" |
#include "chrome/common/url_constants.h" |
-#include "content/public/browser/download_persistent_store_info.h" |
#include "googleurl/src/gurl.h" |
#include "grit/chromium_strings.h" |
#include "grit/generated_resources.h" |
@@ -1292,40 +1292,26 @@ void HistoryBackend::CleanUpInProgressEntries() { |
// Update a particular download entry. |
void HistoryBackend::UpdateDownload( |
- const content::DownloadPersistentStoreInfo& data) { |
+ const DownloadPersistentStoreInfo& data) { |
if (db_.get()) |
db_->UpdateDownload(data); |
} |
-// Update the path of a particular download entry. |
-void HistoryBackend::UpdateDownloadPath(const FilePath& path, |
- int64 db_handle) { |
- if (db_.get()) |
- db_->UpdateDownloadPath(path, db_handle); |
-} |
- |
// Create a new download entry and pass back the db_handle to it. |
void HistoryBackend::CreateDownload( |
scoped_refptr<DownloadCreateRequest> request, |
- int32 id, |
- const content::DownloadPersistentStoreInfo& history_info) { |
+ const DownloadPersistentStoreInfo& history_info) { |
int64 db_handle = 0; |
if (!request->canceled()) { |
if (db_.get()) |
db_handle = db_->CreateDownload(history_info); |
- request->ForwardResult(id, db_handle); |
+ request->ForwardResult(db_handle); |
} |
} |
-void HistoryBackend::RemoveDownload(int64 db_handle) { |
- if (db_.get()) |
- db_->RemoveDownload(db_handle); |
-} |
- |
-void HistoryBackend::RemoveDownloadsBetween(const Time remove_begin, |
- const Time remove_end) { |
+void HistoryBackend::RemoveDownloads(const std::set<int64>& db_handles) { |
if (db_.get()) |
- db_->RemoveDownloadsBetween(remove_begin, remove_end); |
+ db_->RemoveDownloads(db_handles); |
} |
void HistoryBackend::QueryHistory(scoped_refptr<QueryHistoryRequest> request, |