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

Unified Diff: content/child/child_thread_impl.cc

Issue 1465183005: Rename mojo::TokenSerializer to mojo::Broker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win component Created 5 years, 1 month 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
Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 22007ebfd79edf4b498de8df7fbfeaed59dc1667..cfae6595839b806f20e6f80b1d222a55ecdbe849 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -56,6 +56,7 @@
#include "ipc/attachment_broker.h"
#include "ipc/attachment_broker_unprivileged.h"
#include "ipc/ipc_logging.h"
+#include "ipc/ipc_platform_file.h"
#include "ipc/ipc_switches.h"
#include "ipc/ipc_sync_channel.h"
#include "ipc/ipc_sync_message_filter.h"
@@ -731,12 +732,12 @@ void ChildThreadImpl::OnBindExternalMojoShellHandle(
#endif // defined(MOJO_SHELL_CLIENT)
}
-#if defined(OS_WIN)
void ChildThreadImpl::OnSetMojoParentPipeHandle(
const IPC::PlatformFileForTransit& file) {
- mojo::embedder::SetParentPipeHandle(file);
+ mojo::embedder::SetParentPipeHandle(
+ mojo::embedder::ScopedPlatformHandle(mojo::embedder::PlatformHandle(
+ IPC::PlatformFileForTransitToPlatformFile(file))));
}
-#endif
ChildThreadImpl* ChildThreadImpl::current() {
return g_lazy_tls.Pointer()->Get();

Powered by Google App Engine
This is Rietveld 408576698