diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 21:44:43 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 21:44:43 +0000 |
| commit | 3213339b064c87a06785145cbe86de65cf42fd6e (patch) | |
| tree | 8dd86aa67e1b303c1183068cbf8cf18ed33b9a7a /chrome/app/chrome_dll_main.cc | |
| parent | 37ad8892fe9576eef898295e50e7d42b5d7a3e27 (diff) | |
| download | chromium_src-3213339b064c87a06785145cbe86de65cf42fd6e.zip chromium_src-3213339b064c87a06785145cbe86de65cf42fd6e.tar.gz chromium_src-3213339b064c87a06785145cbe86de65cf42fd6e.tar.bz2 | |
Add --enable-nacl switch that enables both NaCl and GPU plugins.
BUG=38554
TEST=nacl_ui_tests
Review URL: http://codereview.chromium.org/1445001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index b865817..3f54f04 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -493,6 +493,13 @@ int ChromeMain(int argc, char** argv) { CHECK(signal(SIGPIPE, SIG_IGN) != SIG_ERR); #endif // OS_POSIX + if (parsed_command_line.HasSwitch(switches::kEnableNaCl)) { + // NaCl currently requires two flags to run + CommandLine* singleton_command_line = CommandLine::ForCurrentProcess(); + singleton_command_line->AppendSwitch(switches::kInternalNaCl); + singleton_command_line->AppendSwitch(switches::kEnableGPUPlugin); + } + base::ProcessId browser_pid; if (process_type.empty()) { browser_pid = base::GetCurrentProcId(); |