diff options
| author | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 18:52:13 +0000 |
|---|---|---|
| committer | dspringer@google.com <dspringer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 18:52:13 +0000 |
| commit | 599e66405108cc22e3cfadeeb65ed59a7913d153 (patch) | |
| tree | a871c7c890d7b677dac8753523c96ef61648182d /chrome/browser/renderer_host/browser_render_process_host.cc | |
| parent | 977e35fe3f7eda0dc1d2c1d6b9cbfa3ab67780b0 (diff) | |
| download | chromium_src-599e66405108cc22e3cfadeeb65ed59a7913d153.zip chromium_src-599e66405108cc22e3cfadeeb65ed59a7913d153.tar.gz chromium_src-599e66405108cc22e3cfadeeb65ed59a7913d153.tar.bz2 | |
Make NaCl run in Chrome on the Mac.
Note: this is a *slight* rework of CL 555082, which accidentally broke the
build. That CL was reviewed and LGTM'd byt sehr@ and bsy@.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/551172
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/browser_render_process_host.cc')
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 6a79b40..5ff39e9 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -495,9 +495,10 @@ void BrowserRenderProcessHost::PropogateBrowserCommandLineToRenderer( switches::kTestSandbox, switches::kEnableSeccompSandbox, #if !defined (GOOGLE_CHROME_BUILD) - // This is an unsupported and not fully tested mode, so don't enable it for - // official Chrome builds. + // These are unsupported and not fully tested modes, so don't enable them + // for official Google Chrome builds. switches::kInProcessPlugins, + switches::kEnableNaCl, #endif switches::kDomAutomationController, switches::kUserAgent, |