Index: chrome/browser/history/history_backend.cc |
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc |
index 7f3bafbdef966fb74d430580fae8031cd3057d38..00e727469a329c2fdb961c4dcaa87d244f22a48d 100644 |
--- a/chrome/browser/history/history_backend.cc |
+++ b/chrome/browser/history/history_backend.cc |
@@ -109,6 +109,15 @@ MostVisitedURL MakeMostVisitedURL(const PageUsageData& page_data, |
return mv; |
} |
+// Converts from PageUsageData to FilteredURL. |
+FilteredURL MakeFilteredURL(const PageUsageData& page_data) { |
GeorgeY
2012/04/19 01:16:24
May be add an explicit constructor
explicit Filte
Rune Fevang
2012/04/25 00:52:45
Done.
|
+ FilteredURL filtered_url; |
+ filtered_url.url = page_data.GetURL(); |
+ filtered_url.title = page_data.GetTitle(); |
+ filtered_url.score = page_data.GetScore(); |
+ return filtered_url; |
+} |
+ |
// This task is run on a timer so that commits happen at regular intervals |
// so they are batched together. The important thing about this class is that |
// it supports canceling of the task so the reference to the backend will be |
@@ -1429,7 +1438,7 @@ void HistoryBackend::QueryMostVisitedURLs( |
} |
void HistoryBackend::QueryFilteredURLs( |
- scoped_refptr<QueryMostVisitedURLsRequest> request, |
+ scoped_refptr<QueryFilteredURLsRequest> request, |
int result_count, |
const history::VisitFilter& filter) { |
if (request->canceled()) |
@@ -1439,7 +1448,7 @@ void HistoryBackend::QueryFilteredURLs( |
if (!db_.get()) { |
// No History Database - return an empty list. |
- request->ForwardResult(request->handle(), MostVisitedURLList()); |
+ request->ForwardResult(request->handle(),FilteredURLList()); |
return; |
} |
@@ -1529,12 +1538,10 @@ void HistoryBackend::QueryFilteredURLs( |
} |
} |
- MostVisitedURLList& result = request->value; |
+ FilteredURLList& result = request->value; |
for (size_t i = 0; i < data.size(); ++i) { |
PageUsageData* current_data = data[i]; |
- RedirectList redirects; |
- GetMostRecentRedirectsFrom(current_data->GetURL(), &redirects); |
- MostVisitedURL url = MakeMostVisitedURL(*current_data, redirects); |
+ FilteredURL url = MakeFilteredURL(*current_data); |
result.push_back(url); |
} |