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

Unified Diff: chrome/browser/chromeos/drive/drive_feed_loader.cc

Issue 11876002: Make largest_changestamp setter/getter asynchronous. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase + comment Created 7 years, 11 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/drive/drive_feed_loader.cc
===================================================================
--- chrome/browser/chromeos/drive/drive_feed_loader.cc (revision 177026)
+++ chrome/browser/chromeos/drive/drive_feed_loader.cc (working copy)
@@ -256,9 +256,6 @@
const FileOperationCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- DVLOG(1) << "ReloadFromServerIfNeeded local_changestamp="
- << resource_metadata_->largest_changestamp()
- << ", loaded=" << resource_metadata_->loaded();
// Sets the refreshing flag, so that the caller does not send refresh requests
// in parallel (see DriveFileSystem::CheckForUpdates). Corresponding
@@ -291,9 +288,7 @@
DCHECK(!callback.is_null());
DCHECK(refreshing_);
- int64 local_changestamp = resource_metadata_->largest_changestamp();
int64 remote_changestamp = 0;
-
// When account metadata successfully fetched, parse the latest changestamp.
if (util::GDataToDriveFileError(status) == DRIVE_FILE_OK) {
DCHECK(account_metadata);
@@ -301,6 +296,21 @@
remote_changestamp = account_metadata->largest_changestamp();
}
+ resource_metadata_->GetLargestChangestamp(
+ base::Bind(&DriveFeedLoader::CompareChangestampsAndLoadIfNeeded,
+ weak_ptr_factory_.GetWeakPtr(),
+ callback,
+ remote_changestamp));
+}
+
+void DriveFeedLoader::CompareChangestampsAndLoadIfNeeded(
+ const FileOperationCallback& callback,
+ int64 remote_changestamp,
+ int64 local_changestamp) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK(!callback.is_null());
+ DCHECK(refreshing_);
+
if (remote_changestamp > 0 && local_changestamp >= remote_changestamp) {
if (local_changestamp > remote_changestamp) {
LOG(WARNING) << "Cached client feed is fresher than server, client = "
« no previous file with comments | « chrome/browser/chromeos/drive/drive_feed_loader.h ('k') | chrome/browser/chromeos/drive/drive_feed_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698