summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppapi_param_traits.cc
diff options
context:
space:
mode:
authorsanga@chromium.org <sanga@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 18:34:40 +0000
committersanga@chromium.org <sanga@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 18:34:40 +0000
commitea505a9d49ef9770557423d2e4525d8fb91eab69 (patch)
tree7ace0236f95b3d101fd0e392d0506845c23d8223 /ppapi/proxy/ppapi_param_traits.cc
parent054498a7c3951d4047812ed918c06d46b3daa6ee (diff)
downloadchromium_src-ea505a9d49ef9770557423d2e4525d8fb91eab69.zip
chromium_src-ea505a9d49ef9770557423d2e4525d8fb91eab69.tar.gz
chromium_src-ea505a9d49ef9770557423d2e4525d8fb91eab69.tar.bz2
Migrating PPB_FileIO_Dev, PPB_FileRef_Dev, and PPB_FileSystem_Dev dependencies to PPB_FileIO, PPB_FileRef, and PPB_FileSystem.
Also fixed some lint errors. Review URL: http://codereview.chromium.org/7248047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppapi_param_traits.cc')
-rw-r--r--ppapi/proxy/ppapi_param_traits.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/ppapi/proxy/ppapi_param_traits.cc b/ppapi/proxy/ppapi_param_traits.cc
index aa21dc1..4c3d2fb 100644
--- a/ppapi/proxy/ppapi_param_traits.cc
+++ b/ppapi/proxy/ppapi_param_traits.cc
@@ -6,7 +6,7 @@
#include <string.h> // For memcpy
-#include "ppapi/c/dev/pp_file_info_dev.h"
+#include "ppapi/c/pp_file_info.h"
#include "ppapi/c/pp_resource.h"
#include "ppapi/c/private/ppb_flash_tcp_socket.h"
#include "ppapi/proxy/host_resource.h"
@@ -97,10 +97,10 @@ bool ParamTraits<PP_Bool>::Read(const Message* m, void** iter, param_type* r) {
void ParamTraits<PP_Bool>::Log(const param_type& p, std::string* l) {
}
-// PP_FileInfo_Dev -------------------------------------------------------------
+// PP_FileInfo -------------------------------------------------------------
// static
-void ParamTraits<PP_FileInfo_Dev>::Write(Message* m, const param_type& p) {
+void ParamTraits<PP_FileInfo>::Write(Message* m, const param_type& p) {
ParamTraits<int64_t>::Write(m, p.size);
ParamTraits<int>::Write(m, static_cast<int>(p.type));
ParamTraits<int>::Write(m, static_cast<int>(p.system_type));
@@ -110,7 +110,7 @@ void ParamTraits<PP_FileInfo_Dev>::Write(Message* m, const param_type& p) {
}
// static
-bool ParamTraits<PP_FileInfo_Dev>::Read(const Message* m, void** iter,
+bool ParamTraits<PP_FileInfo>::Read(const Message* m, void** iter,
param_type* r) {
int type, system_type;
if (!ParamTraits<int64_t>::Read(m, iter, &r->size) ||
@@ -124,17 +124,17 @@ bool ParamTraits<PP_FileInfo_Dev>::Read(const Message* m, void** iter,
type != PP_FILETYPE_DIRECTORY &&
type != PP_FILETYPE_OTHER)
return false;
- r->type = static_cast<PP_FileType_Dev>(type);
+ r->type = static_cast<PP_FileType>(type);
if (system_type != PP_FILESYSTEMTYPE_EXTERNAL &&
system_type != PP_FILESYSTEMTYPE_LOCALPERSISTENT &&
system_type != PP_FILESYSTEMTYPE_LOCALTEMPORARY)
return false;
- r->system_type = static_cast<PP_FileSystemType_Dev>(system_type);
+ r->system_type = static_cast<PP_FileSystemType>(system_type);
return true;
}
// static
-void ParamTraits<PP_FileInfo_Dev>::Log(const param_type& p, std::string* l) {
+void ParamTraits<PP_FileInfo>::Log(const param_type& p, std::string* l) {
}
// PP_Flash_NetAddress ---------------------------------------------------------