| OLD | NEW |
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 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 "ipc/mojo/ipc_mojo_handle_attachment.h" | 5 #include "ipc/mojo/ipc_mojo_handle_attachment.h" |
| 6 | 6 |
| 7 #include "ipc/ipc_message_attachment_set.h" | 7 #include "ipc/ipc_message_attachment_set.h" |
| 8 |
| 9 #if defined(USE_CHROME_EDK) |
| 10 #include "mojo/edk/embedder/embedder.h" |
| 11 #else |
| 8 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" | 12 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
| 13 #endif |
| 9 | 14 |
| 10 namespace IPC { | 15 namespace IPC { |
| 11 namespace internal { | 16 namespace internal { |
| 12 | 17 |
| 13 MojoHandleAttachment::MojoHandleAttachment(mojo::ScopedHandle handle) | 18 MojoHandleAttachment::MojoHandleAttachment(mojo::ScopedHandle handle) |
| 14 : handle_(handle.Pass()) { | 19 : handle_(handle.Pass()) { |
| 15 } | 20 } |
| 16 | 21 |
| 17 MojoHandleAttachment::~MojoHandleAttachment() { | 22 MojoHandleAttachment::~MojoHandleAttachment() { |
| 18 } | 23 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 35 return platform_handle.release().fd; | 40 return platform_handle.release().fd; |
| 36 } | 41 } |
| 37 #endif // OS_POSIX | 42 #endif // OS_POSIX |
| 38 | 43 |
| 39 mojo::ScopedHandle MojoHandleAttachment::TakeHandle() { | 44 mojo::ScopedHandle MojoHandleAttachment::TakeHandle() { |
| 40 return handle_.Pass(); | 45 return handle_.Pass(); |
| 41 } | 46 } |
| 42 | 47 |
| 43 } // namespace internal | 48 } // namespace internal |
| 44 } // namespace IPC | 49 } // namespace IPC |
| OLD | NEW |