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

Unified Diff: ppapi/cpp/private/flash_file.cc

Issue 10696206: PPAPI (Flash): Fix FileModuleLocal::GetDirContents(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/cpp/private/flash_file.h ('k') | ppapi/tests/test_flash_file.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/private/flash_file.cc
diff --git a/ppapi/cpp/private/flash_file.cc b/ppapi/cpp/private/flash_file.cc
index 0f0ee077ee2dd7b3bbd95c96ac3a7ae524f3d5bb..2aea2c3dba454557ddd478041c6939065340be67 100644
--- a/ppapi/cpp/private/flash_file.cc
+++ b/ppapi/cpp/private/flash_file.cc
@@ -28,6 +28,11 @@ template <> const char* interface_name<PPB_Flash_File_ModuleLocal_2_0>() {
namespace flash {
+static FileModuleLocal::DirEntry ConvertDirEntry(const PP_DirEntry_Dev& entry) {
+ FileModuleLocal::DirEntry rv = { entry.name, PP_ToBool(entry.is_dir) };
+ return rv;
+}
+
// static
bool FileModuleLocal::IsAvailable() {
return has_interface<PPB_Flash_File_ModuleLocal_3_0>() ||
@@ -141,7 +146,7 @@ bool FileModuleLocal::QueryFile(const InstanceHandle& instance,
bool FileModuleLocal::GetDirContents(
const InstanceHandle& instance,
const std::string& path,
- std::vector<PP_DirEntry_Dev>* dir_contents) {
+ std::vector<DirEntry>* dir_contents) {
dir_contents->clear();
int32_t result = PP_ERROR_FAILED;
@@ -151,7 +156,7 @@ bool FileModuleLocal::GetDirContents(
GetDirContents(instance.pp_instance(), path.c_str(), &contents);
if (result == PP_OK && contents) {
for (int32_t i = 0; i < contents->count; i++)
- dir_contents->push_back(contents->entries[i]);
+ dir_contents->push_back(ConvertDirEntry(contents->entries[i]));
}
if (contents) {
get_interface<PPB_Flash_File_ModuleLocal_3_0>()->
@@ -163,7 +168,7 @@ bool FileModuleLocal::GetDirContents(
GetDirContents(instance.pp_instance(), path.c_str(), &contents);
if (result == PP_OK && contents) {
for (int32_t i = 0; i < contents->count; i++)
- dir_contents->push_back(contents->entries[i]);
+ dir_contents->push_back(ConvertDirEntry(contents->entries[i]));
}
if (contents) {
get_interface<PPB_Flash_File_ModuleLocal_2_0>()->
« no previous file with comments | « ppapi/cpp/private/flash_file.h ('k') | ppapi/tests/test_flash_file.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698