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

Unified Diff: chrome/browser/chromeos/extensions/file_browser_private_api.cc

Issue 10634020: [FileManager] Do drive search incrementally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit that crept up while rebasing Created 8 years, 5 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: chrome/browser/chromeos/extensions/file_browser_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index b4f46d81609fc82c7505cdb0bdef08e49fcf14e3..b0878e041f4f19b698077e728737baf775df9562 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -2325,6 +2325,9 @@ bool SearchDriveFunction::RunImpl() {
if (!args_->GetString(0, &query_))
return false;
+ if (!args_->GetString(1, &next_feed_))
+ return false;
+
BrowserContext::GetFileSystemContext(profile())->OpenFileSystem(
source_url_.GetOrigin(), fileapi::kFileSystemTypeExternal, false,
base::Bind(&SearchDriveFunction::OnFileSystemOpened, this));
@@ -2351,12 +2354,13 @@ void SearchDriveFunction::OnFileSystemOpened(
}
system_service->file_system()->Search(
- query_,
+ query_, GURL(next_feed_),
base::Bind(&SearchDriveFunction::OnSearch, this));
}
void SearchDriveFunction::OnSearch(
gdata::GDataFileError error,
+ const GURL& next_feed,
scoped_ptr<std::vector<gdata::SearchResultInfo> > results) {
if (error != gdata::GDATA_FILE_OK) {
SendResponse(false);
@@ -2377,7 +2381,11 @@ void SearchDriveFunction::OnSearch(
entries->Append(entry);
}
- SetResult(entries);
+ base::DictionaryValue* result = new DictionaryValue();
+ result->Set("entries", entries);
+ result->SetString("nextFeed", next_feed.spec());
+
+ SetResult(result);
SendResponse(true);
}

Powered by Google App Engine
This is Rietveld 408576698