| Index: content/renderer/pepper/pepper_helper_impl.cc
|
| diff --git a/content/renderer/pepper/pepper_helper_impl.cc b/content/renderer/pepper/pepper_helper_impl.cc
|
| index d6bb5fcc9758f20260f0bc89ae7b2ed6ed22f6a6..6c073ca2ca264ba31b1702f584de1d30ba5a9d42 100644
|
| --- a/content/renderer/pepper/pepper_helper_impl.cc
|
| +++ b/content/renderer/pepper/pepper_helper_impl.cc
|
| @@ -69,6 +69,7 @@
|
| #include "ppapi/proxy/url_loader_resource.h"
|
| #include "ppapi/shared_impl/api_id.h"
|
| #include "ppapi/shared_impl/file_path.h"
|
| +#include "ppapi/shared_impl/file_type_conversion.h"
|
| #include "ppapi/shared_impl/platform_file.h"
|
| #include "ppapi/shared_impl/ppapi_globals.h"
|
| #include "ppapi/shared_impl/ppapi_preferences.h"
|
| @@ -550,12 +551,12 @@ void PepperHelperImpl::OnPpapiBrokerPermissionResult(int request_id,
|
| }
|
|
|
| bool PepperHelperImpl::AsyncOpenFile(const base::FilePath& path,
|
| - int flags,
|
| + int pp_open_flags,
|
| const AsyncOpenFileCallback& callback) {
|
| int message_id = pending_async_open_files_.Add(
|
| new AsyncOpenFileCallback(callback));
|
| - return Send(new ViewHostMsg_AsyncOpenFile(
|
| - routing_id(), path, flags, message_id));
|
| + return Send(new ViewHostMsg_AsyncOpenPepperFile(
|
| + routing_id(), path, pp_open_flags, message_id));
|
| }
|
|
|
| void PepperHelperImpl::OnAsyncFileOpened(
|
| @@ -743,7 +744,7 @@ bool PepperHelperImpl::OnMessageReceived(const IPC::Message& message) {
|
| OnTCPServerSocketAcceptACK)
|
| IPC_MESSAGE_HANDLER(ViewMsg_PpapiBrokerChannelCreated,
|
| OnPpapiBrokerChannelCreated)
|
| - IPC_MESSAGE_HANDLER(ViewMsg_AsyncOpenFile_ACK, OnAsyncFileOpened)
|
| + IPC_MESSAGE_HANDLER(ViewMsg_AsyncOpenPepperFile_ACK, OnAsyncFileOpened)
|
| IPC_MESSAGE_HANDLER(ViewMsg_PpapiBrokerPermissionResult,
|
| OnPpapiBrokerPermissionResult)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
|
|