summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync_file_system/drive_file_sync_service.cc
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-10 01:17:16 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-10 01:17:16 +0000
commit5d9226721d2933a3eaa5fd7a27387d5cc010d3a9 (patch)
tree1ca0a03f2470092427679c61afd4acbfc727fe54 /chrome/browser/sync_file_system/drive_file_sync_service.cc
parentfee7b59ea7dfacffea9e25f29606a0de353ce70a (diff)
downloadchromium_src-5d9226721d2933a3eaa5fd7a27387d5cc010d3a9.zip
chromium_src-5d9226721d2933a3eaa5fd7a27387d5cc010d3a9.tar.gz
chromium_src-5d9226721d2933a3eaa5fd7a27387d5cc010d3a9.tar.bz2
clean-up: Purge ambiguous uses of the term "Document".
In Drive/GData code, sometimes it meant a hosted document like Spreadsheet, and sometimes meant general entries (regular files / hosted documents / collections) on Drive. This patch disambiguates them by the following 5 renamings. - DocumentEntry => ResourceEntry. - GetDocuments => GetResourceList. - DownloadDocument => DownloadHostedDocument. - CopyDocument => CopyHostedDocument. - DeleteDocument => DeleteResource. Along the way, also clarified some parameter names. - {document_url, resource_url} => {edit_url, content_url} BUG=164090 TBR=sky@chromium.org (tbr for chrome_browser gyp change) Review URL: https://codereview.chromium.org/11468019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync_file_system/drive_file_sync_service.cc')
-rw-r--r--chrome/browser/sync_file_system/drive_file_sync_service.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_file_sync_service.cc
index 8699154..35fb4d8 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.cc
@@ -415,7 +415,7 @@ void DriveFileSyncService::GetRemoteFileMetadata(
metadata_store_->ReadEntry(url, &metadata);
if (status != fileapi::SYNC_STATUS_OK)
callback.Run(status, fileapi::SyncFileMetadata());
- sync_client_->GetDocumentEntry(
+ sync_client_->GetResourceEntry(
metadata.resource_id(),
base::Bind(&DriveFileSyncService::DidGetRemoteFileMetadata,
AsWeakPtr(), callback));
@@ -870,7 +870,7 @@ void DriveFileSyncService::DidGetDirectoryContentForBatchSync(
return;
}
- typedef ScopedVector<google_apis::DocumentEntry>::const_iterator iterator;
+ typedef ScopedVector<google_apis::ResourceEntry>::const_iterator iterator;
for (iterator itr = feed->entries().begin();
itr != feed->entries().end(); ++itr) {
AppendRemoteChange(origin, **itr, largest_changestamp,
@@ -901,7 +901,7 @@ void DriveFileSyncService::DidRemoveOriginOnMetadataStore(
void DriveFileSyncService::DidGetRemoteFileMetadata(
const fileapi::SyncFileMetadataCallback& callback,
google_apis::GDataErrorCode error,
- scoped_ptr<google_apis::DocumentEntry> entry) {
+ scoped_ptr<google_apis::ResourceEntry> entry) {
fileapi::SyncFileType file_type = fileapi::SYNC_FILE_TYPE_UNKNOWN;
if (entry->is_file())
file_type = fileapi::SYNC_FILE_TYPE_FILE;
@@ -1462,7 +1462,7 @@ void DriveFileSyncService::FinalizeRemoteSync(
bool DriveFileSyncService::AppendRemoteChange(
const GURL& origin,
- const google_apis::DocumentEntry& entry,
+ const google_apis::ResourceEntry& entry,
int64 changestamp,
RemoteSyncType sync_type) {
// TODO(tzik): Normalize the path here.
@@ -1600,10 +1600,10 @@ void DriveFileSyncService::DidFetchChangesForIncrementalSync(
return;
}
- typedef ScopedVector<google_apis::DocumentEntry>::const_iterator iterator;
+ typedef ScopedVector<google_apis::ResourceEntry>::const_iterator iterator;
for (iterator itr = changes->entries().begin();
itr != changes->entries().end(); ++itr) {
- const google_apis::DocumentEntry& entry = **itr;
+ const google_apis::ResourceEntry& entry = **itr;
GURL origin;
if (!GetOriginForEntry(entry, &origin))
continue;
@@ -1641,7 +1641,7 @@ void DriveFileSyncService::DidFetchChangesForIncrementalSync(
}
bool DriveFileSyncService::GetOriginForEntry(
- const google_apis::DocumentEntry& entry,
+ const google_apis::ResourceEntry& entry,
GURL* origin_out) {
typedef ScopedVector<google_apis::Link>::const_iterator iterator;
for (iterator itr = entry.links().begin();