Chromium Code Reviews| Index: chrome/browser/chromeos/extensions/file_browser_private_api.cc |
| diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc |
| index ed805990cdf4a27deb98a142554dabe4685481a1..d06b31a483a7d8dadab22fb724dc16ca3699e391 100644 |
| --- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc |
| +++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc |
| @@ -1825,7 +1825,8 @@ ListValue* GetFileTransfersFunction::GetFileTransfersList() { |
| return NULL; |
| std::vector<gdata::GDataOperationRegistry::ProgressStatus> |
| - list = system_service->file_system()->GetProgressStatusList(); |
| + list = system_service->file_system()->GetOperationRegistry()-> |
| + GetProgressStatusList(); |
| return file_manager_util::ProgressStatusVectorToListValue( |
| profile_, source_url_.GetOrigin(), list); |
| } |
| @@ -1880,6 +1881,9 @@ void CancelFileTransfersFunction::GetLocalPathsResponseOnUIThread( |
| return; |
| } |
| + gdata::GDataOperationRegistry* operation_registry = |
|
achuithb
2012/04/24 00:16:22
can any of these be NULL?
satorux1
2012/04/24 06:15:25
no. as long as system_service is non-null, the fil
|
| + system_service->file_system()->GetOperationRegistry(); |
| + |
| scoped_ptr<ListValue> responses(new ListValue()); |
| for (size_t i = 0; i < files.size(); ++i) { |
| DCHECK(gdata::util::IsUnderGDataMountPoint(files[i].path)); |
| @@ -1887,7 +1891,7 @@ void CancelFileTransfersFunction::GetLocalPathsResponseOnUIThread( |
| scoped_ptr<DictionaryValue> result(new DictionaryValue()); |
| result->SetBoolean( |
| "canceled", |
| - system_service->file_system()->CancelOperation(file_path)); |
| + operation_registry->CancelForFilePath(file_path)); |
| GURL file_url; |
| if (file_manager_util::ConvertFileToFileSystemUrl(profile_, |
| gdata::util::GetSpecialRemoteRootPath().Append(file_path), |