Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3548)

Unified Diff: content/browser/download/download_item_impl.cc

Issue 10905215: Kill DownloadManager::SearchDownloads, DownloadItem::MatchesQuery (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/download/download_item_impl.cc
diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc
index 053406902ba7e43d870827062f8ad9c0965bf599..f27bebe8f3cd1ea2b840075e0f321da010f6e811 100644
--- a/content/browser/download/download_item_impl.cc
+++ b/content/browser/download/download_item_impl.cc
@@ -30,8 +30,6 @@
#include "base/bind.h"
#include "base/file_util.h"
#include "base/format_macros.h"
-#include "base/i18n/case_conversion.h"
-#include "base/i18n/string_search.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/stl_util.h"
@@ -699,39 +697,6 @@ bool DownloadItemImpl::GetOpened() const {
return opened_;
}
-bool DownloadItemImpl::MatchesQuery(const string16& query) const {
- if (query.empty())
- return true;
-
- DCHECK_EQ(query, base::i18n::ToLower(query));
-
- string16 url_raw(UTF8ToUTF16(GetURL().spec()));
- if (base::i18n::StringSearchIgnoringCaseAndAccents(
- query, url_raw, NULL, NULL)) {
- return true;
- }
-
- // TODO(phajdan.jr): write a test case for the following code.
- // A good test case would be:
- // "/\xe4\xbd\xa0\xe5\xa5\xbd\xe4\xbd\xa0\xe5\xa5\xbd",
- // L"/\x4f60\x597d\x4f60\x597d",
- // "/%E4%BD%A0%E5%A5%BD%E4%BD%A0%E5%A5%BD"
- std::string languages;
- languages = content::GetContentClient()->browser()->GetAcceptLangs(
- GetBrowserContext());
- string16 url_formatted(net::FormatUrl(GetURL(), languages));
- if (base::i18n::StringSearchIgnoringCaseAndAccents(
- query, url_formatted, NULL, NULL)) {
- return true;
- }
-
- // TODO(asanka): Change this to GetTargetFilePath() once DownloadQuery has
- // been modified to work with target paths.
- string16 path(GetFullPath().LossyDisplayName());
- return base::i18n::StringSearchIgnoringCaseAndAccents(
- query, path, NULL, NULL);
-}
-
DownloadPersistentStoreInfo DownloadItemImpl::GetPersistentStoreInfo() const {
// TODO(asanka): Persist GetTargetFilePath() as well.
return DownloadPersistentStoreInfo(GetFullPath(),

Powered by Google App Engine
This is Rietveld 408576698