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

Unified Diff: shell/child_main.cc

Issue 1651183003: Make PlatformChannelPair "dumb". (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 11 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/edk/test/multiprocess_test_helper.cc ('k') | shell/child_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/child_main.cc
diff --git a/shell/child_main.cc b/shell/child_main.cc
index 14505428dc1f2e743e8fa9ba03e66a46137bb4c5..1fdcd7984b3f5e3011a1b3db93409277c6544072 100644
--- a/shell/child_main.cc
+++ b/shell/child_main.cc
@@ -17,6 +17,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
+#include "base/posix/global_descriptors.h"
#include "base/single_thread_task_runner.h"
#include "base/synchronization/waitable_event.h"
#include "base/thread_task_runner_handle.h"
@@ -29,6 +30,7 @@
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/edk/embedder/simple_platform_support.h"
#include "mojo/edk/embedder/slave_process_delegate.h"
+#include "mojo/edk/platform/platform_handle.h"
#include "mojo/edk/platform/platform_handle_watcher.h"
#include "mojo/edk/platform/scoped_platform_handle.h"
#include "mojo/edk/platform/task_runner.h"
@@ -42,6 +44,7 @@
#include "shell/init.h"
#include "shell/native_application_support.h"
+using mojo::platform::PlatformHandle;
using mojo::platform::PlatformHandleWatcher;
using mojo::platform::ScopedPlatformHandle;
using mojo::platform::TaskRunner;
@@ -315,13 +318,8 @@ int main(int argc, char** argv) {
command_line.GetSwitchValueASCII(switches::kChildConnectionId);
CHECK(!child_connection_id.empty());
- std::string platform_channel_info =
- command_line.GetSwitchValueASCII(switches::kPlatformChannelHandleInfo);
- ScopedPlatformHandle platform_handle =
- mojo::embedder::PlatformChannelPair::PassClientHandleFromParentProcess(
- platform_channel_info);
- CHECK(platform_handle.is_valid());
-
+ ScopedPlatformHandle platform_handle(
+ (PlatformHandle(base::GlobalDescriptors::kBaseDescriptor)));
shell::AppContext app_context;
app_context.Init(platform_handle.Pass());
« no previous file with comments | « mojo/edk/test/multiprocess_test_helper.cc ('k') | shell/child_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698