Drive: Remove gdata_params.h

chrome/browser/chromeos/gdata/gdata_operations.h

Index: chrome/browser/chromeos/gdata/gdata_operations.h
diff --git a/chrome/browser/chromeos/gdata/gdata_operations.h b/chrome/browser/chromeos/gdata/gdata_operations.h
index c0e46a1787cae82f19484da02b7dac4ae100ab78..cb21da37453420bea49f1e5f46e88fddeaae28c3 100644
--- a/chrome/browser/chromeos/gdata/gdata_operations.h
+++ b/chrome/browser/chromeos/gdata/gdata_operations.h
@@ -9,9 +9,21 @@
 #include <vector>
 
 #include "chrome/browser/chromeos/gdata/operations_base.h"
+#include "chrome/browser/chromeos/gdata/gdata_upload_file_info.h"
 
 namespace gdata {
 
+class GDataEntry;
+class DocumentEntry;
+
+//================================== Callbacks =================================
+
+// Callback type for getting download data from DownloadFile
+// DocumentServiceInterface calls.

[satorux1, 2012/08/09 22:13:09]

The function comment seems to be out of sync. What about:

// Callback type for getting the content from URLFetcher::GetResponseAsString().

[yoshiki, 2012/08/10 02:11:45]

Done.

+typedef base::Callback<void(
+    GDataErrorCode error,
+    scoped_ptr<std::string> download_data)> GetDownloadDataCallback;

[satorux1, 2012/08/09 22:13:09]

renamed this to GetContentCallback?


I think we can move this to URlFetchOperationBase section in operations_base.h.
Because this is useful for sub classes of URlFetchOperationBase which want to
get the content.

[yoshiki, 2012/08/10 02:11:45]

Done.

+
 //============================ GetDocumentsOperation ===========================
 
 // This class performs the operation for fetching a document list.
@@ -83,6 +95,12 @@ class GetAccountMetadataOperation : public GetDataOperation {
 
 //============================ DownloadFileOperation ===========================
 
+// Callback type for DownloadDocument/DownloadFile DocumentServiceInterface
+// calls.
+typedef base::Callback<void(GDataErrorCode error,
+                            const GURL& content_url,
+                            const FilePath& temp_file)> DownloadActionCallback;
+
 // This class performs the operation for downloading of a given document/file.
 class DownloadFileOperation : public UrlFetchOperationBase {
  public:
@@ -308,6 +326,37 @@ class RemoveResourceFromDirectoryOperation : public EntryActionOperation {
 
 //=========================== InitiateUploadOperation ==========================
 
+// Struct for passing params needed for DocumentsService::InitiateUpload()
+// calls.
+//
+// When uploading a new file (UPLOAD_NEW_FILE):
+// - |title| should be set.
+// - |upload_location| should be the upload_url() of the parent directory.
+//
+// When updating an existing file (UPLOAD_EXISTING_FILE):
+// - |title| should be empty
+// - |upload_location| should be the upload_url() of the existing file.
+struct InitiateUploadParams {
+  InitiateUploadParams(UploadMode upload_mode,
+                       const std::string& title,
+                       const std::string& content_type,
+                       int64 content_length,
+                       const GURL& upload_location,
+                       const FilePath& virtual_path);
+  ~InitiateUploadParams();
+
+  UploadMode upload_mode;
+  std::string title;
+  std::string content_type;
+  int64 content_length;
+  GURL upload_location;
+  const FilePath& virtual_path;
+};
+
+// Callback type for DocumentServiceInterface::InitiateUpload.
+typedef base::Callback<void(GDataErrorCode error,
+                            const GURL& upload_url)> InitiateUploadCallback;
+
 // This class performs the operation for initiating the upload of a file.
 class InitiateUploadOperation : public UrlFetchOperationBase {
  public:
@@ -339,6 +388,49 @@ class InitiateUploadOperation : public UrlFetchOperationBase {
 
 //============================ ResumeUploadOperation ===========================
 
+// Struct for response to ResumeUpload.
+struct ResumeUploadResponse {
+  ResumeUploadResponse(GDataErrorCode code,
+                       int64 start_range_received,
+                       int64 end_range_received);
+  ~ResumeUploadResponse();
+
+  GDataErrorCode code;
+  int64 start_range_received;
+  int64 end_range_received;
+  FilePath virtual_path;
+};
+
+// Struct for passing params needed for DocumentsService::ResumeUpload() calls.
+struct ResumeUploadParams {
+  ResumeUploadParams(UploadMode upload_mode,
+                     int64 start_range,
+                     int64 end_range,
+                     int64 content_length,
+                     const std::string& content_type,
+                     scoped_refptr<net::IOBuffer> buf,
+                     const GURL& upload_location,
+                     const FilePath& virtual_path);
+  ~ResumeUploadParams();
+
+  UploadMode upload_mode;  // Mode of the upload.
+  int64 start_range;  // Start of range of contents currently stored in |buf|.
+  int64 end_range;  // End of range of contents currently stored in |buf|.
+  int64 content_length;  // File content-Length.
+  std::string content_type;   // Content-Type of file.
+  scoped_refptr<net::IOBuffer> buf;  // Holds current content to be uploaded.
+  GURL upload_location;   // Url of where to upload the file to.
+  // Virtual GData path of the file seen in the UI. Not necessary for
+  // resuming an upload, but used for adding an entry to
+  // GDataOperationRegistry.
+  FilePath virtual_path;
+};
+
+// Callback type for DocumentServiceInterface::ResumeUpload.
+typedef base::Callback<void(
+    const ResumeUploadResponse& response,
+    scoped_ptr<gdata::DocumentEntry> new_entry)> ResumeUploadCallback;
+
 // This class performs the operation for resuming the upload of a file.
 class ResumeUploadOperation : public UrlFetchOperationBase {
  public: