diff options
| author | cbiffle@google.com <cbiffle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 22:14:11 +0000 |
|---|---|---|
| committer | cbiffle@google.com <cbiffle@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 22:14:11 +0000 |
| commit | 5cad70a8b935ff6dd33fc311f470f54470527cb7 (patch) | |
| tree | 65ee3658e4de288aca2e2743c5e1b956a55db548 /chrome/browser/plugin_service.cc | |
| parent | 5cd9d7f567ab7e97808c93e3a04a43babfc3c51c (diff) | |
| download | chromium_src-5cad70a8b935ff6dd33fc311f470f54470527cb7.zip chromium_src-5cad70a8b935ff6dd33fc311f470f54470527cb7.tar.gz chromium_src-5cad70a8b935ff6dd33fc311f470f54470527cb7.tar.bz2 | |
Due to some unresolved blocking issues, we are switching Native Client back off for applications/extensions in M7. This change is aiming for a small diff, since I'm going to turn it right back on once this is cherrypicked. Thus there's some small redundancy, e.g. in render_view.cc.
BUG=45881
TEST=included
Review URL: http://codereview.chromium.org/3324002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.cc')
| -rw-r--r-- | chrome/browser/plugin_service.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index 2a3dcb5..5ab9368 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -110,7 +110,9 @@ PluginService::PluginService() } #ifndef DISABLE_NACL - RegisterInternalNaClPlugin(); + if (command_line->HasSwitch(switches::kInternalNaCl)) { + RegisterInternalNaClPlugin(); + } #endif chrome::RegisterInternalGPUPlugin(); |