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

Side by Side Diff: chrome/browser/chromeos/drive/job_scheduler.h

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_
6 #define CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_ 6 #define CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/id_map.h" 10 #include "base/id_map.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 const ClientContext& context, 168 const ClientContext& context,
169 const google_apis::DownloadActionCallback& download_action_callback, 169 const google_apis::DownloadActionCallback& download_action_callback,
170 const google_apis::GetContentCallback& get_content_callback); 170 const google_apis::GetContentCallback& get_content_callback);
171 171
172 // Adds an UploadNewFile operation to the queue. 172 // Adds an UploadNewFile operation to the queue.
173 void UploadNewFile(const std::string& parent_resource_id, 173 void UploadNewFile(const std::string& parent_resource_id,
174 const base::FilePath& drive_file_path, 174 const base::FilePath& drive_file_path,
175 const base::FilePath& local_file_path, 175 const base::FilePath& local_file_path,
176 const std::string& title, 176 const std::string& title,
177 const std::string& content_type, 177 const std::string& content_type,
178 const drive::DriveUploader::UploadNewFileOptions& options,
178 const ClientContext& context, 179 const ClientContext& context,
179 const google_apis::GetResourceEntryCallback& callback); 180 const google_apis::GetResourceEntryCallback& callback);
180 181
181 // Adds an UploadExistingFile operation to the queue. 182 // Adds an UploadExistingFile operation to the queue.
182 void UploadExistingFile( 183 void UploadExistingFile(
183 const std::string& resource_id, 184 const std::string& resource_id,
184 const base::FilePath& drive_file_path, 185 const base::FilePath& drive_file_path,
185 const base::FilePath& local_file_path, 186 const base::FilePath& local_file_path,
186 const std::string& content_type, 187 const std::string& content_type,
187 const drive::DriveUploader::UploadExistingFileOptions& options, 188 const drive::DriveUploader::UploadExistingFileOptions& options,
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 392
392 // Note: This should remain the last member so it'll be destroyed and 393 // Note: This should remain the last member so it'll be destroyed and
393 // invalidate its weak pointers before any other members are destroyed. 394 // invalidate its weak pointers before any other members are destroyed.
394 base::WeakPtrFactory<JobScheduler> weak_ptr_factory_; 395 base::WeakPtrFactory<JobScheduler> weak_ptr_factory_;
395 DISALLOW_COPY_AND_ASSIGN(JobScheduler); 396 DISALLOW_COPY_AND_ASSIGN(JobScheduler);
396 }; 397 };
397 398
398 } // namespace drive 399 } // namespace drive
399 400
400 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_ 401 #endif // CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/file_system/operation_test_base.h ('k') | chrome/browser/chromeos/drive/job_scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698