summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/drive/file_system.cc
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 16:31:35 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-24 16:31:35 +0000
commitba268ed9dafa05d0343a0cb794e37de39681ac24 (patch)
tree2f08517a742942530db618160f661d88e2592703 /chrome/browser/chromeos/drive/file_system.cc
parentcd2434bc3b2f3fb3ad29afb2c13e22fd1ac6c988 (diff)
downloadchromium_src-ba268ed9dafa05d0343a0cb794e37de39681ac24.zip
chromium_src-ba268ed9dafa05d0343a0cb794e37de39681ac24.tar.gz
chromium_src-ba268ed9dafa05d0343a0cb794e37de39681ac24.tar.bz2
Remove CheckForUpdates hack in Drive Search.
It was added in the old days of Drive integration that did not synced the file list in a timely manner. Since the latest implementation automatically calls CheckForUpdates when notified, we don't need to call it here explicitly anymore. BUG=243641 Review URL: https://chromiumcodereview.appspot.com/15965003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/drive/file_system.cc')
-rw-r--r--chrome/browser/chromeos/drive/file_system.cc20
1 files changed, 1 insertions, 19 deletions
diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc
index 975fbd5..9fa085a 100644
--- a/chrome/browser/chromeos/drive/file_system.cc
+++ b/chrome/browser/chromeos/drive/file_system.cc
@@ -1187,31 +1187,13 @@ void FileSystem::OnGetAboutResource(
about_resource->quota_bytes_used());
}
-void FileSystem::OnSearch(const SearchCallback& callback,
- FileError error,
- bool is_update_needed,
- const GURL& next_feed,
- scoped_ptr<std::vector<SearchResultInfo> > result) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(!callback.is_null());
-
- if (is_update_needed)
- CheckForUpdates();
-
- callback.Run(error, next_feed, result.Pass());
-}
-
void FileSystem::Search(const std::string& search_query,
const GURL& next_feed,
const SearchCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- drive_operations_.Search(search_query,
- next_feed,
- base::Bind(&FileSystem::OnSearch,
- weak_ptr_factory_.GetWeakPtr(),
- callback));
+ drive_operations_.Search(search_query, next_feed, callback);
}
void FileSystem::SearchMetadata(const std::string& query,