Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Unified Diff: mojo/platform_handle/platform_handle_functions.cc

Issue 1676913002: [mojo] Delete third_party/mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: let's try that again Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/platform_handle/BUILD.gn ('k') | mojo/public/c/system/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..942b6338bd6386f1da63206c74a615b73b541a27 100644
--- a/mojo/platform_handle/platform_handle_functions.cc
+++ b/mojo/platform_handle/platform_handle_functions.cc
@@ -6,35 +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)
*platform_handle = scoped_platform_handle.release().handle;
-#else
-#error "Platform not yet supported."
-#endif
return MOJO_RESULT_OK;
}
« no previous file with comments | « mojo/platform_handle/BUILD.gn ('k') | mojo/public/c/system/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698