Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / file_system_provider / operations / read_directory.cc

diff --git a/src/chrome/browser/chromeos/file_system_provider/operations/read_directory.cc b/src/chrome/browser/chromeos/file_system_provider/operations/read_directory.cc
index eda2ca6..3a94434 100644 (file)
--- a/src/chrome/browser/chromeos/file_system_provider/operations/read_directory.cc
+++ b/src/chrome/browser/chromeos/file_system_provider/operations/read_directory.cc
@@ -17,7 +17,7 @@ namespace {
 
 // Convert |input| into |output|. If parsing fails, then returns false.
 bool ConvertRequestValueToEntryList(scoped_ptr<RequestValue> value,
-                                    fileapi::AsyncFileUtil::EntryList* output) {
+                                    storage::AsyncFileUtil::EntryList* output) {
   using extensions::api::file_system_provider::EntryMetadata;
   using extensions::api::file_system_provider_internal::
       ReadDirectoryRequestedSuccess::Params;
@@ -29,7 +29,7 @@ bool ConvertRequestValueToEntryList(scoped_ptr<RequestValue> value,
   for (size_t i = 0; i < params->entries.size(); ++i) {
     const linked_ptr<EntryMetadata> entry_metadata = params->entries[i];
 
-    fileapi::DirectoryEntry output_entry;
+    storage::DirectoryEntry output_entry;
     output_entry.is_directory = entry_metadata->is_directory;
     output_entry.name = entry_metadata->name;
     output_entry.size = static_cast<int64>(entry_metadata->size);
@@ -56,7 +56,7 @@ ReadDirectory::ReadDirectory(
     extensions::EventRouter* event_router,
     const ProvidedFileSystemInfo& file_system_info,
     const base::FilePath& directory_path,
-    const fileapi::AsyncFileUtil::ReadDirectoryCallback& callback)
+    const storage::AsyncFileUtil::ReadDirectoryCallback& callback)
     : Operation(event_router, file_system_info),
       directory_path_(directory_path),
       callback_(callback) {
@@ -66,18 +66,25 @@ ReadDirectory::~ReadDirectory() {
 }
 
 bool ReadDirectory::Execute(int request_id) {
-  scoped_ptr<base::DictionaryValue> values(new base::DictionaryValue);
-  values->SetString("directoryPath", directory_path_.AsUTF8Unsafe());
-  return SendEvent(request_id,
-                   extensions::api::file_system_provider::
-                       OnReadDirectoryRequested::kEventName,
-                   values.Pass());
+  using extensions::api::file_system_provider::ReadDirectoryRequestedOptions;
+
+  ReadDirectoryRequestedOptions options;
+  options.file_system_id = file_system_info_.file_system_id();
+  options.request_id = request_id;
+  options.directory_path = directory_path_.AsUTF8Unsafe();
+
+  return SendEvent(
+      request_id,
+      extensions::api::file_system_provider::OnReadDirectoryRequested::
+          kEventName,
+      extensions::api::file_system_provider::OnReadDirectoryRequested::Create(
+          options));
 }
 
 void ReadDirectory::OnSuccess(int /* request_id */,
                               scoped_ptr<RequestValue> result,
                               bool has_more) {
-  fileapi::AsyncFileUtil::EntryList entry_list;
+  storage::AsyncFileUtil::EntryList entry_list;
   const bool convert_result =
       ConvertRequestValueToEntryList(result.Pass(), &entry_list);
 
@@ -85,7 +92,7 @@ void ReadDirectory::OnSuccess(int /* request_id */,
     LOG(ERROR)
         << "Failed to parse a response for the read directory operation.";
     callback_.Run(base::File::FILE_ERROR_IO,
-                  fileapi::AsyncFileUtil::EntryList(),
+                  storage::AsyncFileUtil::EntryList(),
                   false /* has_more */);
     return;
   }
@@ -97,7 +104,7 @@ void ReadDirectory::OnError(int /* request_id */,
                             scoped_ptr<RequestValue> /* result */,
                             base::File::Error error) {
   callback_.Run(
-      error, fileapi::AsyncFileUtil::EntryList(), false /* has_more */);
+      error, storage::AsyncFileUtil::EntryList(), false /* has_more */);
 }
 
 }  // namespace operations