Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(686)

Unified Diff: chrome/browser/chromeos/drive/job_scheduler.cc

Issue 148233006: drive: Use UploadNewFile from EntryUpdatePerformer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/job_scheduler.cc
diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc
index 68c666fde37f0f064edca43b758159f54d354008..3163d56524fcbd0762667e1a8b274efb22ccda68 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler.cc
@@ -73,6 +73,7 @@ struct UploadNewFileParams {
base::FilePath local_file_path;
std::string title;
std::string content_type;
+ drive::DriveUploader::UploadNewFileOptions options;
UploadCompletionCallback callback;
google_apis::ProgressCallback progress_callback;
};
@@ -85,7 +86,7 @@ google_apis::CancelCallback RunUploadNewFile(
params.local_file_path,
params.title,
params.content_type,
- DriveUploader::UploadNewFileOptions(),
+ params.options,
params.callback,
params.progress_callback);
}
@@ -618,6 +619,7 @@ void JobScheduler::UploadNewFile(
const base::FilePath& local_file_path,
const std::string& title,
const std::string& content_type,
+ const drive::DriveUploader::UploadNewFileOptions& options,
const ClientContext& context,
const google_apis::GetResourceEntryCallback& callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -631,6 +633,7 @@ void JobScheduler::UploadNewFile(
params.local_file_path = local_file_path;
params.title = title;
params.content_type = content_type;
+ params.options = options;
ResumeUploadParams resume_params;
resume_params.local_file_path = params.local_file_path;
« no previous file with comments | « chrome/browser/chromeos/drive/job_scheduler.h ('k') | chrome/browser/chromeos/drive/job_scheduler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698