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

Unified Diff: chrome/browser/chromeos/gdata/gdata_file_system.cc

Issue 10836285: Refactor GDataWapiFeedLoader::LoadFromServer() parameters (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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/gdata/gdata_file_system.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.cc b/chrome/browser/chromeos/gdata/gdata_file_system.cc
index 51f4a4c6a4b9023216b39626beb33981af6823ff..53e325b28be381395d813252eb640829f16df99f 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.cc
@@ -2026,18 +2026,13 @@ void GDataFileSystem::RequestDirectoryRefreshOnUIThreadAfterGetEntryInfo(
return;
}
- feed_loader_->LoadFromServer(
- directory_service_->origin(),
- 0, // start_changestamp - Not a delta feed.
- 0, // root_feed_changestamp - Not used.
- true, // multiple feeds
- std::string(), // No search query
- GURL(), // feed_to_load - Feed not explicitly set
- entry_proto->resource_id(), // Load the feed for this directory.
- FileOperationCallback(), // load_finished_callback.
- base::Bind(&GDataFileSystem::OnRequestDirectoryRefresh,
- ui_weak_ptr_,
- file_path));
+ LoadFeedParams param(directory_service_->origin(),
+ base::Bind(&GDataFileSystem::OnRequestDirectoryRefresh,
+ ui_weak_ptr_,
+ file_path));
+ param.directory_resource_id = entry_proto->resource_id();
+ param.load_finished_callback = FileOperationCallback();
+ feed_loader_->LoadFromServer(param);
}
void GDataFileSystem::OnRequestDirectoryRefresh(
@@ -2439,18 +2434,12 @@ void GDataFileSystem::SearchAsyncOnUIThread(
new std::vector<DocumentFeed*>);
ContentOrigin initial_origin = directory_service_->origin();
- feed_loader_->LoadFromServer(
+ LoadFeedParams param(
initial_origin,
- 0, 0, // We don't use change stamps when fetching search
- // data; we always fetch the whole result feed.
- false, // Stop fetching search results after first feed
- // chunk to avoid displaying huge number of search
- // results (especially since we don't cache them).
- search_query,
- next_feed,
- std::string(), // No directory resource ID.
- FileOperationCallback(), // Not used.
base::Bind(&GDataFileSystem::OnSearch, ui_weak_ptr_, callback));
+ param.search_query = search_query;
+ param.feed_to_load = next_feed;
+ feed_loader_->LoadFromServer(param);
}
void GDataFileSystem::OnDirectoryChanged(const FilePath& directory_path) {

Powered by Google App Engine
This is Rietveld 408576698