OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/nacl/renderer/manifest_service_channel.h" | 5 #include "components/nacl/renderer/manifest_service_channel.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "content/public/renderer/render_thread.h" | 10 #include "content/public/renderer/render_thread.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 weak_ptr_factory_.GetWeakPtr(), reply)); | 78 weak_ptr_factory_.GetWeakPtr(), reply)); |
79 #else | 79 #else |
80 PpapiHostMsg_OpenResource::WriteReplyParams( | 80 PpapiHostMsg_OpenResource::WriteReplyParams( |
81 reply, ppapi::proxy::SerializedHandle()); | 81 reply, ppapi::proxy::SerializedHandle()); |
82 Send(reply); | 82 Send(reply); |
83 #endif | 83 #endif |
84 } | 84 } |
85 | 85 |
86 #if !defined(OS_WIN) | 86 #if !defined(OS_WIN) |
87 void ManifestServiceChannel::DidOpenResource( | 87 void ManifestServiceChannel::DidOpenResource( |
88 IPC::Message* reply, const base::PlatformFile& platform_file) { | 88 IPC::Message* reply, base::File file) { |
89 // Here, PlatformFileForTransit is alias of base::FileDescriptor. | 89 // Here, PlatformFileForTransit is alias of base::FileDescriptor. |
90 PpapiHostMsg_OpenResource::WriteReplyParams( | 90 PpapiHostMsg_OpenResource::WriteReplyParams( |
91 reply, | 91 reply, |
92 ppapi::proxy::SerializedHandle( | 92 ppapi::proxy::SerializedHandle( |
93 ppapi::proxy::SerializedHandle::FILE, | 93 ppapi::proxy::SerializedHandle::FILE, |
94 base::FileDescriptor(platform_file, true))); | 94 base::FileDescriptor(file.Pass()))); |
95 Send(reply); | 95 Send(reply); |
96 } | 96 } |
97 #endif | 97 #endif |
98 | 98 |
99 } // namespace nacl | 99 } // namespace nacl |
OLD | NEW |