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

Unified Diff: components/nacl/loader/nacl_main.cc

Issue 1184523003: attachment broker wip (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor comments. Created 5 years, 6 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 | « components/nacl/loader/nacl_listener.cc ('k') | components/nacl/loader/nacl_trusted_listener.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_main.cc
diff --git a/components/nacl/loader/nacl_main.cc b/components/nacl/loader/nacl_main.cc
index 9139c70b28d753e4d483358a1b48634d04f83095..f2aa9eeb2cee769db18383fd129ff6c9cf339374 100644
--- a/components/nacl/loader/nacl_main.cc
+++ b/components/nacl/loader/nacl_main.cc
@@ -13,6 +13,11 @@
#include "components/nacl/loader/nacl_main_platform_delegate.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
+#include "ipc/attachment_broker.h"
+
+#if defined(OS_WIN)
+#include "ipc/attachment_broker_win.h"
+#endif
// main() routine for the NaCl loader process.
int NaClMain(const content::MainFunctionParams& parameters) {
@@ -41,7 +46,13 @@ int NaClMain(const content::MainFunctionParams& parameters) {
if (!no_sandbox) {
platform.EnableSandbox();
}
- NaClListener listener;
+
+ scoped_ptr<IPC::AttachmentBroker> attachment_broker;
+#if defined(OS_WIN)
+ attachment_broker.reset(new IPC::AttachmentBrokerWin());
+#endif
+
+ NaClListener listener(attachment_broker.get());
#if defined(OS_POSIX)
listener.set_number_of_cores(number_of_cores);
#endif
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | components/nacl/loader/nacl_trusted_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698