diff options
Diffstat (limited to 'chrome/browser/chromeos/drive')
8 files changed, 21 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc index ef9e2b9..1c46ad0 100644 --- a/chrome/browser/chromeos/drive/change_list_loader.cc +++ b/chrome/browser/chromeos/drive/change_list_loader.cc @@ -19,6 +19,7 @@ #include "chrome/browser/drive/event_logger.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/directory_loader.cc b/chrome/browser/chromeos/drive/directory_loader.cc index ba6939b..8154edb 100644 --- a/chrome/browser/chromeos/drive/directory_loader.cc +++ b/chrome/browser/chromeos/drive/directory_loader.cc @@ -18,6 +18,7 @@ #include "chrome/browser/drive/event_logger.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.cc b/chrome/browser/chromeos/drive/file_system/copy_operation.cc index d3f3af8..c301edf 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation.cc +++ b/chrome/browser/chromeos/drive/file_system/copy_operation.cc @@ -19,6 +19,7 @@ #include "chrome/browser/drive/drive_api_util.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc index f7e8927..96f93d7 100644 --- a/chrome/browser/chromeos/drive/job_scheduler.cc +++ b/chrome/browser/chromeos/drive/job_scheduler.cc @@ -15,6 +15,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "google_apis/drive/drive_api_parser.h" +#include "google_apis/drive/gdata_wapi_parser.h" using content::BrowserThread; @@ -1010,7 +1011,7 @@ void JobScheduler::OnUploadCompletionJobDone( const google_apis::GetResourceEntryCallback& callback, google_apis::GDataErrorCode error, const GURL& upload_location, - scoped_ptr<google_apis::ResourceEntry> resource_entry) { + scoped_ptr<google_apis::FileResource> entry) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!callback.is_null()); @@ -1037,8 +1038,11 @@ void JobScheduler::OnUploadCompletionJobDone( job_entry->task = base::Bind(&RunResumeUploadFile, uploader_.get(), params); } - if (OnJobDone(job_id, error)) - callback.Run(error, resource_entry.Pass()); + if (OnJobDone(job_id, error)) { + callback.Run(error, entry ? + util::ConvertFileResourceToResourceEntry(*entry) : + scoped_ptr<google_apis::ResourceEntry>()); + } } void JobScheduler::OnResumeUploadFileDone( @@ -1047,7 +1051,7 @@ void JobScheduler::OnResumeUploadFileDone( const google_apis::GetResourceEntryCallback& callback, google_apis::GDataErrorCode error, const GURL& upload_location, - scoped_ptr<google_apis::ResourceEntry> resource_entry) { + scoped_ptr<google_apis::FileResource> entry) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(!original_task.is_null()); DCHECK(!callback.is_null()); @@ -1060,8 +1064,11 @@ void JobScheduler::OnResumeUploadFileDone( job_entry->task = original_task; } - if (OnJobDone(job_id, error)) - callback.Run(error, resource_entry.Pass()); + if (OnJobDone(job_id, error)) { + callback.Run(error, entry ? + util::ConvertFileResourceToResourceEntry(*entry) : + scoped_ptr<google_apis::ResourceEntry>()); + } } void JobScheduler::UpdateProgress(JobID job_id, int64 progress, int64 total) { diff --git a/chrome/browser/chromeos/drive/job_scheduler.h b/chrome/browser/chromeos/drive/job_scheduler.h index f28741c..2361faf 100644 --- a/chrome/browser/chromeos/drive/job_scheduler.h +++ b/chrome/browser/chromeos/drive/job_scheduler.h @@ -336,7 +336,7 @@ class JobScheduler const google_apis::GetResourceEntryCallback& callback, google_apis::GDataErrorCode error, const GURL& upload_location, - scoped_ptr<google_apis::ResourceEntry> resource_entry); + scoped_ptr<google_apis::FileResource> entry); // Callback for DriveUploader::ResumeUploadFile(). void OnResumeUploadFileDone( @@ -345,7 +345,7 @@ class JobScheduler const google_apis::GetResourceEntryCallback& callback, google_apis::GDataErrorCode error, const GURL& upload_location, - scoped_ptr<google_apis::ResourceEntry> resource_entry); + scoped_ptr<google_apis::FileResource> entry); // Updates the progress status of the specified job. void UpdateProgress(JobID job_id, int64 progress, int64 total); diff --git a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc index fc7d067..42df680 100644 --- a/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc +++ b/chrome/browser/chromeos/drive/sync/entry_revert_performer.cc @@ -11,6 +11,7 @@ #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/gdata_wapi_parser.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc index 47954b2..9b3aa56 100644 --- a/chrome/browser/chromeos/drive/sync/entry_update_performer.cc +++ b/chrome/browser/chromeos/drive/sync/entry_update_performer.cc @@ -16,6 +16,7 @@ #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h" #include "chrome/browser/chromeos/drive/sync/remove_performer.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/gdata_wapi_parser.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/drive/sync/remove_performer.cc b/chrome/browser/chromeos/drive/sync/remove_performer.cc index 63fa5b8..527b1cf 100644 --- a/chrome/browser/chromeos/drive/sync/remove_performer.cc +++ b/chrome/browser/chromeos/drive/sync/remove_performer.cc @@ -13,6 +13,7 @@ #include "chrome/browser/chromeos/drive/resource_metadata.h" #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h" #include "content/public/browser/browser_thread.h" +#include "google_apis/drive/gdata_wapi_parser.h" using content::BrowserThread; |