Index: ppapi/cpp/output_traits.h |
diff --git a/ppapi/cpp/output_traits.h b/ppapi/cpp/output_traits.h |
index 889c6128098ebb183a6a65f21c092ffab4a96326..3b0488128dc79bbceb9d031ca6cef1581818c645 100644 |
--- a/ppapi/cpp/output_traits.h |
+++ b/ppapi/cpp/output_traits.h |
@@ -9,7 +9,7 @@ |
#include "ppapi/c/pp_resource.h" |
#include "ppapi/cpp/array_output.h" |
-#include "ppapi/cpp/dev/directory_entry_dev.h" |
+#include "ppapi/cpp/directory_entry.h" |
#include "ppapi/cpp/extensions/ext_output_traits.h" |
#include "ppapi/cpp/resource.h" |
@@ -246,10 +246,10 @@ struct CallbackOutputTraits< std::vector<pp::Var> > { |
}; |
// A specialization of CallbackOutputTraits to provide the callback system the |
-// information on how to handle vectors of pp::DirectoryEntry_Dev. This converts |
-// PP_DirectoryEntry_Dev to pp::DirectoryEntry_Dev when passing to the plugin. |
+// information on how to handle vectors of pp::DirectoryEntry. This converts |
+// PP_DirectoryEntry to pp::DirectoryEntry when passing to the plugin. |
template<> |
-struct CallbackOutputTraits< std::vector<pp::DirectoryEntry_Dev> > { |
+struct CallbackOutputTraits< std::vector<pp::DirectoryEntry> > { |
typedef PP_ArrayOutput APIArgType; |
typedef DirectoryEntryArrayOutputAdapterWithStorage StorageType; |
@@ -257,7 +257,7 @@ struct CallbackOutputTraits< std::vector<pp::DirectoryEntry_Dev> > { |
return t.pp_array_output(); |
} |
- static inline std::vector<pp::DirectoryEntry_Dev>& StorageToPluginArg( |
+ static inline std::vector<pp::DirectoryEntry>& StorageToPluginArg( |
StorageType& t) { |
return t.output(); |
} |