Kill DownloadManager::SearchDownloads, DownloadItem::MatchesQuery

chrome/browser/ui/webui/downloads_dom_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/downloads_dom_handler.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_piece.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_crx_util.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_prefs.h"
+#include "chrome/browser/download/download_query.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/fileicon_source.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
@@ skipping 16 matching lines @@
 using content::BrowserContext;
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 namespace {
 
 // Maximum number of downloads to show. TODO(glen): Remove this and instead
 // stuff the downloads down the pipe slowly.
 static const size_t kMaxDownloads = 150;
 
-// Sorts DownloadItems into descending order by their start time.
-class DownloadItemSorter : public std::binary_function<content::DownloadItem*,
-                                                       content::DownloadItem*,
-                                                       bool> {
- public:
-  bool operator()(const content::DownloadItem* lhs,
-                  const content::DownloadItem* rhs) {
-    return lhs->GetStartTime() > rhs->GetStartTime();
-  }
-};
-
 enum DownloadsDOMEvent {
   DOWNLOADS_DOM_EVENT_GET_DOWNLOADS = 0,
   DOWNLOADS_DOM_EVENT_OPEN_FILE = 1,
   DOWNLOADS_DOM_EVENT_DRAG = 2,
   DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS = 3,
   DOWNLOADS_DOM_EVENT_DISCARD_DANGEROUS = 4,
   DOWNLOADS_DOM_EVENT_SHOW = 5,
   DOWNLOADS_DOM_EVENT_PAUSE = 6,
   DOWNLOADS_DOM_EVENT_REMOVE = 7,
   DOWNLOADS_DOM_EVENT_CANCEL = 8,
@@ skipping 153 matching lines @@
   // Observe the DownloadManagers.
   download_manager_->AddObserver(this);
   if (profile->IsOffTheRecord()) {
     original_profile_download_manager_ =
         BrowserContext::GetDownloadManager(profile->GetOriginalProfile());
     original_profile_download_manager_->AddObserver(this);
   }
 
   // Observe all the DownloadItems.
   content::DownloadManager::DownloadVector downloads;
-  SearchDownloads(&downloads);
+  GetAllDownloads(&downloads);
   for (content::DownloadManager::DownloadVector::const_iterator
            iter = downloads.begin();
        iter != downloads.end(); ++iter) {
     (*iter)->AddObserver(this);
     observing_items_.insert(*iter);
   }
 }
 
 DownloadsDOMHandler::~DownloadsDOMHandler() {
   for (DownloadSet::const_iterator it = observing_items_.begin();
@@ skipping 60 matching lines @@
   // display in SendCurrentDownloads() and OnDownloadUpdated() using
   // IsDownloadDisplayable().
   download_item->AddObserver(this);
   observing_items_.insert(download_item);
   if (IsDownloadDisplayable(*download_item))
     ScheduleSendCurrentDownloads();
 }
 
 void DownloadsDOMHandler::OnDownloadUpdated(
     content::DownloadItem* download_item) {
   if (IsDownloadDisplayable(*download_item)) {

[Randy Smith (Not in Mondays), 2012/09/12 18:20:57]

If there's a download updated that isn't in the search text, won't this code
mean that it's displayed on the downloads.html page?

[benjhayden, 2012/09/12 19:31:57]

Done.

     base::ListValue results_value;
     results_value.Append(CreateDownloadItemValue(download_item, IsItemIncognito(
         download_item->GetId(),
         download_manager_,
         original_profile_download_manager_)));
     CallDownloadUpdated(results_value);
   }
 }
 
 void DownloadsDOMHandler::OnDownloadDestroyed(
@@ skipping 115 matching lines @@
     return;
   update_scheduled_ = true;
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&DownloadsDOMHandler::SendCurrentDownloads,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DownloadsDOMHandler::SendCurrentDownloads() {
   update_scheduled_ = false;
-  content::DownloadManager::DownloadVector downloads;
-  SearchDownloads(&downloads);
-  sort(downloads.begin(), downloads.end(), DownloadItemSorter());
+  content::DownloadManager::DownloadVector all_items, filtered_items;
+  GetAllDownloads(&all_items);
+  DownloadQuery query;
+  if (!search_text_.empty()) {
+    scoped_ptr<base::Value> query_text(base::Value::CreateStringValue(
+        search_text_));
+    DCHECK(query.AddFilter(DownloadQuery::FILTER_QUERY, *query_text.get()));

[asanka, 2012/09/12 18:43:49]

Side-effects in a DCHECK

[benjhayden, 2012/09/12 19:31:57]

Done.

+  }
+  query.AddFilter(base::Bind(&IsDownloadDisplayable));
+  query.AddSorter(DownloadQuery::SORT_START_TIME, DownloadQuery::DESCENDING);
+  query.Limit(kMaxDownloads);
+  query.Search(all_items.begin(), all_items.end(), &filtered_items);
   base::ListValue results_value;
   for (content::DownloadManager::DownloadVector::const_iterator
-           iter = downloads.begin();
-       iter != downloads.end(); ++iter) {
-    if (IsDownloadDisplayable(**iter))
-      results_value.Append(CreateDownloadItemValue(*iter, IsItemIncognito(
-          (*iter)->GetId(), download_manager_,
-          original_profile_download_manager_)));
-    if (results_value.GetSize() == kMaxDownloads)
-      break;
+       iter = filtered_items.begin(); iter != filtered_items.end(); ++iter) {
+    results_value.Append(CreateDownloadItemValue(*iter, IsItemIncognito(
+        (*iter)->GetId(), download_manager_,
+        original_profile_download_manager_)));
   }
   CallDownloadsList(results_value);
 }
 
-void DownloadsDOMHandler::SearchDownloads(
+void DownloadsDOMHandler::GetAllDownloads(
     content::DownloadManager::DownloadVector* downloads) {
-  download_manager_->SearchDownloads(search_text_, downloads);
+  download_manager_->GetAllDownloads(downloads);
   if (original_profile_download_manager_)
-    original_profile_download_manager_->SearchDownloads(
-        search_text_, downloads);
+    original_profile_download_manager_->GetAllDownloads(downloads);
 }
 
 void DownloadsDOMHandler::ShowDangerPrompt(
     content::DownloadItem* dangerous_item) {
   DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create(
       dangerous_item,
       TabContents::FromWebContents(GetWebUIWebContents()),
       base::Bind(&DownloadsDOMHandler::DangerPromptAccepted,
                  weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId()),
       base::Closure());
@@ skipping 26 matching lines @@
 }
 
 void DownloadsDOMHandler::CallDownloadsList(const base::ListValue& downloads) {
   web_ui()->CallJavascriptFunction("downloadsList", downloads);
 }
 
 void DownloadsDOMHandler::CallDownloadUpdated(
     const base::ListValue& download_item) {
   web_ui()->CallJavascriptFunction("downloadUpdated", download_item);
 }