Index: ppapi/proxy/pepper_file_messages.h |
=================================================================== |
--- ppapi/proxy/pepper_file_messages.h (revision 140403) |
+++ ppapi/proxy/pepper_file_messages.h (working copy) |
@@ -3,22 +3,22 @@ |
// found in the LICENSE file. |
// Multiply-included message file, no traditional include guard. |
-#include "content/public/common/common_param_traits.h" |
#include "ipc/ipc_message_macros.h" |
#include "ipc/ipc_param_traits.h" |
#include "ipc/ipc_platform_file.h" |
-#include "webkit/plugins/ppapi/dir_contents.h" |
-#include "webkit/plugins/ppapi/file_path.h" |
+#include "ppapi/proxy/ppapi_proxy_export.h" |
+#include "ppapi/shared_impl/dir_contents.h" |
+#include "ppapi/shared_impl/file_path.h" |
// Singly-included section since need custom serialization. |
-#ifndef CONTENT_COMMON_PEPPER_FILE_MESSAGES_H_ |
-#define CONTENT_COMMON_PEPPER_FILE_MESSAGES_H_ |
+#ifndef PPAPI_SHARED_IMPL_PEPPER_FILE_MESSAGES_H_ |
+#define PPAPI_SHARED_IMPL_PEPPER_FILE_MESSAGES_H_ |
namespace IPC { |
template <> |
-struct ParamTraits<webkit::ppapi::PepperFilePath> { |
- typedef webkit::ppapi::PepperFilePath param_type; |
+struct ParamTraits<ppapi::PepperFilePath> { |
+ typedef ppapi::PepperFilePath param_type; |
static void Write(Message* m, const param_type& p); |
static bool Read(const Message* m, PickleIterator* iter, param_type* p); |
static void Log(const param_type& p, std::string* l); |
@@ -26,11 +26,14 @@ |
} // namespace IPC |
-#endif // CONTENT_COMMON_PEPPER_FILE_MESSAGES_H_ |
+#endif // PPAPI_SHARED_IMPL_PEPPER_FILE_MESSAGES_H_ |
+#undef IPC_MESSAGE_EXPORT |
+#define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT |
+ |
#define IPC_MESSAGE_START PepperFileMsgStart |
-IPC_STRUCT_TRAITS_BEGIN(webkit::ppapi::DirEntry) |
+IPC_STRUCT_TRAITS_BEGIN(ppapi::DirEntry) |
IPC_STRUCT_TRAITS_MEMBER(name) |
IPC_STRUCT_TRAITS_MEMBER(is_dir) |
IPC_STRUCT_TRAITS_END() |
@@ -39,37 +42,37 @@ |
// Open the file. |
IPC_SYNC_MESSAGE_CONTROL2_2(PepperFileMsg_OpenFile, |
- webkit::ppapi::PepperFilePath /* path */, |
+ ppapi::PepperFilePath /* path */, |
int /* flags */, |
base::PlatformFileError /* error_code */, |
IPC::PlatformFileForTransit /* result */) |
// Rename the file. |
IPC_SYNC_MESSAGE_CONTROL2_1(PepperFileMsg_RenameFile, |
- webkit::ppapi::PepperFilePath /* from_path */, |
- webkit::ppapi::PepperFilePath /* to_path */, |
+ ppapi::PepperFilePath /* from_path */, |
+ ppapi::PepperFilePath /* to_path */, |
base::PlatformFileError /* error_code */) |
// Delete the file. |
IPC_SYNC_MESSAGE_CONTROL2_1(PepperFileMsg_DeleteFileOrDir, |
- webkit::ppapi::PepperFilePath /* path */, |
+ ppapi::PepperFilePath /* path */, |
bool /* recursive */, |
base::PlatformFileError /* error_code */) |
// Create the directory. |
IPC_SYNC_MESSAGE_CONTROL1_1(PepperFileMsg_CreateDir, |
- webkit::ppapi::PepperFilePath /* path */, |
+ ppapi::PepperFilePath /* path */, |
base::PlatformFileError /* error_code */) |
// Query the file's info. |
IPC_SYNC_MESSAGE_CONTROL1_2(PepperFileMsg_QueryFile, |
- webkit::ppapi::PepperFilePath /* path */, |
+ ppapi::PepperFilePath /* path */, |
base::PlatformFileInfo, /* info */ |
base::PlatformFileError /* error_code */) |
// Get the directory's contents. |
IPC_SYNC_MESSAGE_CONTROL1_2(PepperFileMsg_GetDirContents, |
- webkit::ppapi::PepperFilePath /* path */, |
- webkit::ppapi::DirContents, /* contents */ |
+ ppapi::PepperFilePath /* path */, |
+ ppapi::DirContents, /* contents */ |
base::PlatformFileError /* error_code */) |