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

Side by Side Diff: components/nacl/loader/nonsfi/nonsfi_listener.cc

Issue 2389193004: Always use ChannelMojo for content child processes. (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/nacl/loader/nonsfi/nonsfi_listener.h" 5 #include "components/nacl/loader/nonsfi/nonsfi_listener.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_descriptor_posix.h" 10 #include "base/file_descriptor_posix.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/posix/global_descriptors.h" 13 #include "base/posix/global_descriptors.h"
14 #include "base/rand_util.h" 14 #include "base/rand_util.h"
15 #include "base/run_loop.h" 15 #include "base/run_loop.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "components/nacl/common/nacl_messages.h" 17 #include "components/nacl/common/nacl_messages.h"
18 #include "components/nacl/common/nacl_types.h" 18 #include "components/nacl/common/nacl_types.h"
19 #include "components/nacl/loader/nacl_trusted_listener.h" 19 #include "components/nacl/loader/nacl_trusted_listener.h"
20 #include "components/nacl/loader/nonsfi/nonsfi_main.h" 20 #include "components/nacl/loader/nonsfi/nonsfi_main.h"
21 #include "content/public/common/content_descriptors.h" 21 #include "content/public/common/content_descriptors.h"
22 #include "content/public/common/mojo_channel_switches.h" 22 #include "content/public/common/mojo_channel_switches.h"
23 #include "ipc/ipc_channel.h" 23 #include "ipc/ipc_channel.h"
24 #include "ipc/ipc_channel_handle.h" 24 #include "ipc/ipc_channel_handle.h"
25 #include "ipc/ipc_switches.h"
26 #include "ipc/ipc_sync_channel.h" 25 #include "ipc/ipc_sync_channel.h"
27 #include "mojo/edk/embedder/embedder.h" 26 #include "mojo/edk/embedder/embedder.h"
28 #include "mojo/edk/embedder/scoped_ipc_support.h" 27 #include "mojo/edk/embedder/scoped_ipc_support.h"
29 #include "native_client/src/public/nonsfi/irt_random.h" 28 #include "native_client/src/public/nonsfi/irt_random.h"
30 #include "ppapi/nacl_irt/irt_manifest.h" 29 #include "ppapi/nacl_irt/irt_manifest.h"
31 #include "ppapi/nacl_irt/plugin_startup.h" 30 #include "ppapi/nacl_irt/plugin_startup.h"
32 31
33 #if !defined(OS_NACL_NONSFI) 32 #if !defined(OS_NACL_NONSFI)
34 #error "This file must be built for nacl_helper_nonsfi." 33 #error "This file must be built for nacl_helper_nonsfi."
35 #endif 34 #endif
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 CHECK(params.nexe_file != IPC::InvalidPlatformFileForTransit()); 147 CHECK(params.nexe_file != IPC::InvalidPlatformFileForTransit());
149 CHECK(params.nexe_file_path_metadata.empty()); 148 CHECK(params.nexe_file_path_metadata.empty());
150 149
151 ppapi::RegisterPreopenedDescriptorsNonSfi(key_fd_map_.release()); 150 ppapi::RegisterPreopenedDescriptorsNonSfi(key_fd_map_.release());
152 151
153 MainStart(IPC::PlatformFileForTransitToPlatformFile(params.nexe_file)); 152 MainStart(IPC::PlatformFileForTransitToPlatformFile(params.nexe_file));
154 } 153 }
155 154
156 } // namespace nonsfi 155 } // namespace nonsfi
157 } // namespace nacl 156 } // namespace nacl
OLDNEW
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698