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

Unified Diff: ipc/mojo/ipc_mojo_handle_attachment.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 | « ipc/mojo/ipc_mojo_bootstrap_unittest.cc ('k') | ipc/mojo/ipc_mojo_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/mojo/ipc_mojo_handle_attachment.cc
diff --git a/ipc/mojo/ipc_mojo_handle_attachment.cc b/ipc/mojo/ipc_mojo_handle_attachment.cc
index 70b80c57b13503abd70f9ffe011ec8daf4886000..ccce0d95621e731f48a614680a5170e6320e1fc9 100644
--- a/ipc/mojo/ipc_mojo_handle_attachment.cc
+++ b/ipc/mojo/ipc_mojo_handle_attachment.cc
@@ -8,7 +8,7 @@
#include "build/build_config.h"
#include "ipc/ipc_message_attachment_set.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/embedder.h"
namespace IPC {
namespace internal {
@@ -25,8 +25,8 @@ MessageAttachment::Type MojoHandleAttachment::GetType() const {
#if defined(OS_POSIX)
base::PlatformFile MojoHandleAttachment::TakePlatformFile() {
- mojo::embedder::ScopedPlatformHandle platform_handle;
- MojoResult unwrap_result = mojo::embedder::PassWrappedPlatformHandle(
+ mojo::edk::ScopedPlatformHandle platform_handle;
+ MojoResult unwrap_result = mojo::edk::PassWrappedPlatformHandle(
handle_.get().value(), &platform_handle);
handle_.reset();
if (unwrap_result != MOJO_RESULT_OK) {
@@ -34,7 +34,7 @@ base::PlatformFile MojoHandleAttachment::TakePlatformFile() {
return -1;
}
- return platform_handle.release().fd;
+ return platform_handle.release().handle;
}
#endif // OS_POSIX
« no previous file with comments | « ipc/mojo/ipc_mojo_bootstrap_unittest.cc ('k') | ipc/mojo/ipc_mojo_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698