summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 19:00:31 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 19:00:31 +0000
commitd8c7cbccd6557ed455d9d4a212a2824972072505 (patch)
treeff9261a8931be3775c6c3786c4527a30cf6b5676 /chrome/renderer
parent21e8556f0651a4e132fde29bc4738229eaa3305b (diff)
downloadchromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.zip
chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.tar.gz
chromium_src-d8c7cbccd6557ed455d9d4a212a2824972072505.tar.bz2
Add an option to disable NaCl at compile time for platforms where it doesn't build yet
Just add disable_nacl=1 to gyp defines Review URL: http://codereview.chromium.org/257029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/render_process.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc
index fbe38cf..6992a67 100644
--- a/chrome/renderer/render_process.cc
+++ b/chrome/renderer/render_process.cc
@@ -82,8 +82,10 @@ RenderProcess::RenderProcess()
StatisticsRecorder::set_dump_on_exit(true);
}
+#ifndef DISABLE_NACL
if (command_line.HasSwitch(switches::kInternalNaCl))
RegisterInternalNaClPlugin(RenderProcess::LaunchNaClProcess);
+#endif
if (command_line.HasSwitch(switches::kEnableByteRangeSupport)) {
webkit_glue::SetMediaCacheEnabled(true);