| 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 abaad03476638653aa8d8089ce817080d2eecd82..edd9d4e7d8beff811164b5a73753436d369f662d 100644
|
| --- a/chrome/browser/chromeos/gdata/gdata_operations.h
|
| +++ b/chrome/browser/chromeos/gdata/gdata_operations.h
|
| @@ -89,7 +89,7 @@ class GetAccountMetadataOperation : public GetDataOperation {
|
|
|
| // Callback type for DownloadDocument/DownloadFile DocumentServiceInterface
|
| // calls.
|
| -typedef base::Callback<void(GDataErrorCode error,
|
| +typedef base::Callback<void(DriveErrorCode error,
|
| const GURL& content_url,
|
| const FilePath& temp_file)> DownloadActionCallback;
|
|
|
| @@ -109,7 +109,7 @@ class DownloadFileOperation : public UrlFetchOperationBase {
|
| // Overridden from UrlFetchOperationBase.
|
| virtual GURL GetURL() const OVERRIDE;
|
| virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
|
| - virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
|
| + virtual void RunCallbackOnPrematureFailure(DriveErrorCode code) OVERRIDE;
|
|
|
| // Overridden from net::URLFetcherDelegate.
|
| virtual void OnURLFetchDownloadProgress(const net::URLFetcher* source,
|
| @@ -257,7 +257,7 @@ class AuthorizeAppsOperation : public GetDataOperation {
|
|
|
| // Must override GetDataOperation's ParseResponse because the response is XML
|
| // not JSON.
|
| - virtual void ParseResponse(GDataErrorCode fetch_error_code,
|
| + virtual void ParseResponse(DriveErrorCode fetch_error_code,
|
| const std::string& data) OVERRIDE;
|
|
|
| private:
|
| @@ -348,7 +348,7 @@ struct InitiateUploadParams {
|
| };
|
|
|
| // Callback type for DocumentServiceInterface::InitiateUpload.
|
| -typedef base::Callback<void(GDataErrorCode error,
|
| +typedef base::Callback<void(DriveErrorCode error,
|
| const GURL& upload_url)> InitiateUploadCallback;
|
|
|
| // This class performs the operation for initiating the upload of a file.
|
| @@ -364,7 +364,7 @@ class InitiateUploadOperation : public UrlFetchOperationBase {
|
| virtual GURL GetURL() const OVERRIDE;
|
| virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
|
| virtual void NotifySuccessToOperationRegistry() OVERRIDE;
|
| - virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
|
| + virtual void RunCallbackOnPrematureFailure(DriveErrorCode code) OVERRIDE;
|
|
|
| // Overridden from UrlFetchOperationBase.
|
| virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
|
| @@ -384,12 +384,12 @@ class InitiateUploadOperation : public UrlFetchOperationBase {
|
|
|
| // Struct for response to ResumeUpload.
|
| struct ResumeUploadResponse {
|
| - ResumeUploadResponse(GDataErrorCode code,
|
| + ResumeUploadResponse(DriveErrorCode code,
|
| int64 start_range_received,
|
| int64 end_range_received);
|
| ~ResumeUploadResponse();
|
|
|
| - GDataErrorCode code;
|
| + DriveErrorCode code;
|
| int64 start_range_received;
|
| int64 end_range_received;
|
| FilePath virtual_path;
|
| @@ -439,7 +439,7 @@ class ResumeUploadOperation : public UrlFetchOperationBase {
|
| virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
|
| virtual void NotifyStartToOperationRegistry() OVERRIDE;
|
| virtual void NotifySuccessToOperationRegistry() OVERRIDE;
|
| - virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
|
| + virtual void RunCallbackOnPrematureFailure(DriveErrorCode code) OVERRIDE;
|
|
|
| // Overridden from UrlFetchOperationBase.
|
| virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
|
| @@ -532,7 +532,7 @@ class GetContactPhotoOperation : public UrlFetchOperationBase {
|
| // Overridden from UrlFetchOperationBase.
|
| virtual GURL GetURL() const OVERRIDE;
|
| virtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE;
|
| - virtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE;
|
| + virtual void RunCallbackOnPrematureFailure(DriveErrorCode code) OVERRIDE;
|
|
|
| private:
|
| // Location of the photo to fetch.
|
|
|