diff options
| author | cbiffle@google.com <cbiffle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 19:15:59 +0000 |
|---|---|---|
| committer | cbiffle@google.com <cbiffle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 19:15:59 +0000 |
| commit | ddd7b0f6bc138a4fd7a7ea8b37f9fbedc69f25dd (patch) | |
| tree | e13a1957c79891a92b1495c65cc137ed8d947024 /chrome/nacl/nacl_main.cc | |
| parent | 262eb2c897b956c8f7cc518ff45437a206f8ffb5 (diff) | |
| download | chromium_src-ddd7b0f6bc138a4fd7a7ea8b37f9fbedc69f25dd.zip chromium_src-ddd7b0f6bc138a4fd7a7ea8b37f9fbedc69f25dd.tar.gz chromium_src-ddd7b0f6bc138a4fd7a7ea8b37f9fbedc69f25dd.tar.bz2 | |
Enabled in-process NaCl plugin on Linux. Turns out it's remarkably similar to OS X support, so this CL simply tweaks the #ifdefs.
BUG=32602
TEST=none
Review URL: http://codereview.chromium.org/569018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl/nacl_main.cc')
| -rw-r--r-- | chrome/nacl/nacl_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index ffda8ab..88f7af8 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -98,7 +98,7 @@ static void LaunchNaClChildProcess(bool no_sandbox, target_services->LowerToken(); MessageLoop::current()->Run(); } -#elif defined(OS_MACOSX) +#elif defined(OS_MACOSX) || defined(OS_LINUX) static void LaunchNaClChildProcess() { ChildProcess nacl_process; nacl_process.set_main_thread(new NaClThread()); @@ -149,7 +149,7 @@ int NaClMain(const MainFunctionParams& parameters) { } LaunchNaClChildProcess(no_sandbox, target_services); -#elif defined(OS_MACOSX) +#elif defined(OS_MACOSX) || defined(OS_LINUX) LaunchNaClChildProcess(); #else |