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

Unified Diff: ppapi/native_client/src/trusted/plugin/service_runtime.cc

Issue 10266003: NaCl: Move sel_ldr_launcher_chrome.cc into the Chromium repo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix namespace Created 8 years, 8 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 | « ppapi/native_client/src/trusted/plugin/service_runtime.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/trusted/plugin/service_runtime.cc
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.cc b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
index 37a836d68c0b3fa80368cfd2d7328956e2f58efb..8a75b1ef1d55748c30df4f7d65c966f2041ad7a2 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.cc
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
@@ -45,6 +45,7 @@
#include "native_client/src/trusted/plugin/plugin.h"
#include "native_client/src/trusted/plugin/plugin_error.h"
#include "native_client/src/trusted/plugin/pnacl_coordinator.h"
+#include "native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h"
#include "native_client/src/trusted/plugin/srpc_client.h"
#include "native_client/src/trusted/plugin/utility.h"
@@ -627,8 +628,12 @@ bool ServiceRuntime::Start(nacl::DescWrapper* nacl_desc,
PLUGIN_PRINTF(("ServiceRuntime::Start (nacl_desc=%p)\n",
reinterpret_cast<void*>(nacl_desc)));
- nacl::scoped_ptr<nacl::SelLdrLauncher>
- tmp_subprocess(new nacl::SelLdrLauncher());
+ nacl::scoped_ptr<nacl::SelLdrLauncherBase> tmp_subprocess;
+#ifdef NACL_STANDALONE
+ tmp_subprocess.reset(new nacl::SelLdrLauncherStandalone());
+#else
+ tmp_subprocess.reset(new SelLdrLauncherChrome());
+#endif
if (NULL == tmp_subprocess.get()) {
PLUGIN_PRINTF(("ServiceRuntime::Start (subprocess create failed)\n"));
error_info->SetReport(ERROR_SEL_LDR_CREATE_LAUNCHER,
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/service_runtime.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698