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

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

Issue 13149003: drive: Use "/drive/root" namespace and fix Files app and tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge glitches. Created 7 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/drive_file_system.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/change_list_loader.cc
diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc
index a566a882f1941914d9381cbc2d416db43bbad21b..0ca58ce8fb7cefedfa54736293559c812fface42 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.cc
+++ b/chrome/browser/chromeos/drive/change_list_loader.cc
@@ -217,10 +217,12 @@ void ChangeListLoader::CompareChangestampsAndLoadIfNeeded(
LoadChangeListFromServer(about_resource.Pass(),
start_changestamp,
callback);
- } else if (directory_fetch_info.changestamp() < remote_changestamp) {
+ } else if (directory_fetch_info.changestamp() < remote_changestamp &&
+ !util::IsSpecialResourceId(directory_fetch_info.resource_id())) {
// If the caller is interested in a particular directory, and the
// directory changestamp is older than server's, start loading the
- // directory first.
+ // directory first. Skip special entries as they are not meaningful in the
+ // server.
DVLOG(1) << "Fast-fetching directory: " << directory_fetch_info.ToString()
<< "; remote_changestamp: " << remote_changestamp;
const DirectoryFetchInfo new_directory_fetch_info(
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/drive_file_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698