From 5d9226721d2933a3eaa5fd7a27387d5cc010d3a9 Mon Sep 17 00:00:00 2001 From: "kinaba@chromium.org" Date: Mon, 10 Dec 2012 01:17:16 +0000 Subject: 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 --- chrome/browser/chromeos/drive/drive_file_system.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome/browser/chromeos/drive/drive_file_system.h') diff --git a/chrome/browser/chromeos/drive/drive_file_system.h b/chrome/browser/chromeos/drive/drive_file_system.h index 9cbf598..ab529bc 100644 --- a/chrome/browser/chromeos/drive/drive_file_system.h +++ b/chrome/browser/chromeos/drive/drive_file_system.h @@ -129,7 +129,7 @@ class DriveFileSystem : public DriveFileSystemInterface, virtual void GetAvailableSpace( const GetAvailableSpaceCallback& callback) OVERRIDE; virtual void AddUploadedFile(const FilePath& directory_path, - scoped_ptr doc_entry, + scoped_ptr doc_entry, const FilePath& file_content_path, const FileOperationCallback& callback) OVERRIDE; virtual DriveFileSystemMetadata GetMetadata() const OVERRIDE; @@ -426,16 +426,16 @@ class DriveFileSystem : public DriveFileSystemInterface, DriveFileError error, const FilePath& cache_file_path); - // Callback for |drive_service_->GetDocumentEntry|. - // It is called before file download. If GetDocumentEntry was successful, + // Callback for |drive_service_->GetResourceEntry|. + // It is called before file download. If GetResourceEntry was successful, // file download procedure is started for the file. The file is downloaded // from the content url extracted from the fetched metadata. - void OnGetDocumentEntry(const GetFileFromCacheParams& params, + void OnGetResourceEntry(const GetFileFromCacheParams& params, google_apis::GDataErrorCode status, scoped_ptr data); // Check available space using file size from the fetched metadata. Called - // from OnGetDocumentEntry after RefreshFile is complete. + // from OnGetResourceEntry after RefreshFile is complete. void CheckForSpaceBeforeDownload( const GetFileFromCacheParams& params, int64 file_size, -- cgit v1.1