Chromium Code Reviews| Index: chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc |
| diff --git a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc |
| index 52ebdd87612d808a8cc5e2c9bea0f43cd8cd455a..6de95a0aada3ff0f6ee598f3a7bd66993435dee7 100644 |
| --- a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc |
| +++ b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc |
| @@ -9,12 +9,14 @@ |
| #include "base/values.h" |
| #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h" |
| #include "chrome/browser/chromeos/file_system_provider/request_manager.h" |
| +#include "chrome/browser/chromeos/file_system_provider/request_value.h" |
| #include "chrome/browser/chromeos/file_system_provider/service.h" |
| #include "chrome/common/extensions/api/file_system_provider.h" |
| #include "chrome/common/extensions/api/file_system_provider_internal.h" |
| using chromeos::file_system_provider::ProvidedFileSystemInterface; |
| using chromeos::file_system_provider::RequestManager; |
| +using chromeos::file_system_provider::RequestValue; |
| using chromeos::file_system_provider::Service; |
| namespace extensions { |
| @@ -151,7 +153,7 @@ bool FileSystemProviderUnmountFunction::RunImpl() { |
| bool FileSystemProviderInternalUnmountRequestedSuccessFunction::RunImpl() { |
| using api::file_system_provider_internal::UnmountRequestedSuccess::Params; |
| - const scoped_ptr<Params> params(Params::Create(*args_)); |
| + scoped_ptr<Params> params(Params::Create(*args_)); |
| EXTENSION_FUNCTION_VALIDATE(params); |
| Service* service = Service::Get(GetProfile()); |
| @@ -170,9 +172,11 @@ bool FileSystemProviderInternalUnmountRequestedSuccessFunction::RunImpl() { |
| RequestManager* request_manager = file_system->GetRequestManager(); |
| DCHECK(request_manager); |
| - if (!request_manager->FulfillRequest(params->request_id, |
| - scoped_ptr<base::DictionaryValue>(), |
| - false /* has_more */)) { |
| + const int request_id = params->request_id; |
| + if (!request_manager->FulfillRequest( |
| + request_id, |
| + make_scoped_ptr(RequestValue::CreateForUnmountSuccess(params.Pass())), |
| + false /* has_more */)) { |
| // TODO(mtomasz): Pass more detailed errors, rather than just a bool. |
| base::ListValue* result = new base::ListValue(); |
| result->Append( |
| @@ -188,7 +192,7 @@ bool FileSystemProviderInternalUnmountRequestedSuccessFunction::RunImpl() { |
| bool FileSystemProviderInternalUnmountRequestedErrorFunction::RunImpl() { |
| using api::file_system_provider_internal::UnmountRequestedError::Params; |
| - const scoped_ptr<Params> params(Params::Create(*args_)); |
| + scoped_ptr<Params> params(Params::Create(*args_)); |
|
kinaba
2014/04/25 06:35:06
nit: The changes for this function looks unneccess
mtomasz
2014/04/28 00:42:47
Done.
|
| EXTENSION_FUNCTION_VALIDATE(params); |
| Service* service = Service::Get(GetProfile()); |
| @@ -207,8 +211,9 @@ bool FileSystemProviderInternalUnmountRequestedErrorFunction::RunImpl() { |
| RequestManager* request_manager = file_system->GetRequestManager(); |
| DCHECK(request_manager); |
| + const int request_id = params->request_id; |
| if (!request_manager->RejectRequest( |
| - params->request_id, ProviderErrorToFileError(params->error))) { |
| + request_id, ProviderErrorToFileError(params->error))) { |
| // TODO(mtomasz): Pass more detailed errors, rather than just a bool. |
| base::ListValue* result = new base::ListValue(); |
| result->Append( |