| 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 883a784e53a5514f4d5cf429a9a41ac794e763eb..6628566ebc2516dc56d94beb253d83a9271fe15e 100644
|
| --- a/chrome/browser/chromeos/drive/job_scheduler.cc
|
| +++ b/chrome/browser/chromeos/drive/job_scheduler.cc
|
| @@ -250,6 +250,24 @@ void JobScheduler::GetAboutResource(
|
| StartJob(new_job);
|
| }
|
|
|
| +void JobScheduler::GetFileResource(
|
| + const std::string& resource_id,
|
| + const google_apis::FileResourceCallback& callback) {
|
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| + DCHECK(!callback.is_null());
|
| +
|
| + JobEntry* new_job = CreateNewJob(TYPE_GET_FILE_RESOURCE);
|
| + new_job->task = base::Bind(&DriveServiceInterface::GetFileResource,
|
| + base::Unretained(drive_service_),
|
| + resource_id,
|
| + base::Bind(&JobScheduler::OnGetFileResourceJobDone,
|
| + weak_ptr_factory_.GetWeakPtr(),
|
| + new_job->job_info.job_id,
|
| + callback));
|
| + new_job->abort_callback = CreateErrorRunCallback(callback);
|
| + StartJob(new_job);
|
| +}
|
| +
|
| void JobScheduler::GetAppList(const google_apis::AppListCallback& callback) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(!callback.is_null());
|
| @@ -399,11 +417,10 @@ void JobScheduler::GetFileResource(
|
| StartJob(new_job);
|
| }
|
|
|
| -void JobScheduler::GetShareUrl(
|
| - const std::string& resource_id,
|
| - const GURL& embed_origin,
|
| - const ClientContext& context,
|
| - const google_apis::GetShareUrlCallback& callback) {
|
| +void JobScheduler::GetShareUrl(const std::string& resource_id,
|
| + const GURL& embed_origin,
|
| + const ClientContext& context,
|
| + const google_apis::GetUrlCallback& callback) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(!callback.is_null());
|
|
|
| @@ -946,7 +963,7 @@ void JobScheduler::OnGetAboutResourceJobDone(
|
|
|
| void JobScheduler::OnGetShareUrlJobDone(
|
| JobID job_id,
|
| - const google_apis::GetShareUrlCallback& callback,
|
| + const google_apis::GetUrlCallback& callback,
|
| google_apis::GDataErrorCode error,
|
| const GURL& share_url) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| @@ -1076,6 +1093,7 @@ JobScheduler::QueueType JobScheduler::GetJobQueueType(JobType type) {
|
| switch (type) {
|
| case TYPE_GET_ABOUT_RESOURCE:
|
| case TYPE_GET_APP_LIST:
|
| + case TYPE_GET_FILE_RESOURCE:
|
| case TYPE_GET_ALL_RESOURCE_LIST:
|
| case TYPE_GET_RESOURCE_LIST_IN_DIRECTORY:
|
| case TYPE_SEARCH:
|
|
|