Chromium Code Reviews| Index: mojo/platform_handle/platform_handle_functions.cc |
| diff --git a/mojo/platform_handle/platform_handle_functions.cc b/mojo/platform_handle/platform_handle_functions.cc |
| index 7b721b0824c621d90ad5f5d557938ef3a19993e3..75dae4c69a09fca53331a62d1121dcc074bdc1a6 100644 |
| --- a/mojo/platform_handle/platform_handle_functions.cc |
| +++ b/mojo/platform_handle/platform_handle_functions.cc |
| @@ -6,31 +6,29 @@ |
| #include <utility> |
| -#include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
| +#include "mojo/edk/embedder/embedder.h" |
| extern "C" { |
| MojoResult MojoCreatePlatformHandleWrapper(MojoPlatformHandle platform_handle, |
| MojoHandle* wrapper) { |
| - mojo::embedder::PlatformHandle platform_handle_wrapper(platform_handle); |
| - mojo::embedder::ScopedPlatformHandle scoped_platform_handle( |
| + mojo::edk::PlatformHandle platform_handle_wrapper(platform_handle); |
| + mojo::edk::ScopedPlatformHandle scoped_platform_handle( |
| platform_handle_wrapper); |
| - return mojo::embedder::CreatePlatformHandleWrapper( |
| + return mojo::edk::CreatePlatformHandleWrapper( |
| std::move(scoped_platform_handle), wrapper); |
| } |
| MojoResult MojoExtractPlatformHandle(MojoHandle wrapper, |
| MojoPlatformHandle* platform_handle) { |
| - mojo::embedder::ScopedPlatformHandle scoped_platform_handle; |
| - MojoResult result = mojo::embedder::PassWrappedPlatformHandle( |
| - wrapper, &scoped_platform_handle); |
| + mojo::edk::ScopedPlatformHandle scoped_platform_handle; |
| + MojoResult result = |
| + mojo::edk::PassWrappedPlatformHandle(wrapper, &scoped_platform_handle); |
| if (result != MOJO_RESULT_OK) |
| return result; |
| DCHECK(scoped_platform_handle.is_valid()); |
| -#if defined(OS_POSIX) |
| - *platform_handle = scoped_platform_handle.release().fd; |
| -#elif defined(OS_WIN) |
| +#if defined(OS_POSIX) || defined(OS_WIN) |
|
jam
2016/02/08 17:32:12
remove this whole ifdef?
Ken Rockot(use gerrit already)
2016/02/08 17:51:18
Done
|
| *platform_handle = scoped_platform_handle.release().handle; |
| #else |
| #error "Platform not yet supported." |