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

Side by Side Diff: ppapi/nacl_irt/irt_start.cc

Issue 2081183005: Use ChannelMojo from the browser to NaCl loader process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-ipc-channel-handle
Patch Set: rebase Created 4 years, 5 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 | « content/zygote/zygote_linux.cc ('k') | ppapi/nacl_irt/plugin_startup.h » ('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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 // We need nacl_irt_start injection in SFI mode. Non-SFI has a different 7 // We need nacl_irt_start injection in SFI mode. Non-SFI has a different
8 // start up procedure so we just exclude it. 8 // start up procedure so we just exclude it.
9 #if defined(OS_NACL_SFI) 9 #if defined(OS_NACL_SFI)
10 10
(...skipping 17 matching lines...) Expand all
28 28
29 // Though it isn't referenced here, we must instantiate an AtExitManager. 29 // Though it isn't referenced here, we must instantiate an AtExitManager.
30 base::AtExitManager exit_manager; 30 base::AtExitManager exit_manager;
31 31
32 // In SFI mode, the FDs of IPC channels are NACL_CHROME_DESC_BASE and its 32 // In SFI mode, the FDs of IPC channels are NACL_CHROME_DESC_BASE and its
33 // successor, which is set in nacl_listener.cc. 33 // successor, which is set in nacl_listener.cc.
34 ppapi::SetIPCChannelHandles( 34 ppapi::SetIPCChannelHandles(
35 MakeIPCHandle("NaCl Browser", NACL_CHROME_DESC_BASE), 35 MakeIPCHandle("NaCl Browser", NACL_CHROME_DESC_BASE),
36 MakeIPCHandle("NaCl Renderer", NACL_CHROME_DESC_BASE + 1), 36 MakeIPCHandle("NaCl Renderer", NACL_CHROME_DESC_BASE + 1),
37 MakeIPCHandle("NaCl Manifest", NACL_CHROME_DESC_BASE + 2)); 37 MakeIPCHandle("NaCl Manifest", NACL_CHROME_DESC_BASE + 2));
38 ppapi::StartUpPlugin(); 38 ppapi::StartUpPlugin(true);
39 39
40 nacl_irt_enter_user_code(info, chrome_irt_query); 40 nacl_irt_enter_user_code(info, chrome_irt_query);
41 } 41 }
42 42
43 #endif // defined(OS_NACL_SFI) 43 #endif // defined(OS_NACL_SFI)
OLDNEW
« no previous file with comments | « content/zygote/zygote_linux.cc ('k') | ppapi/nacl_irt/plugin_startup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698