diff options
author | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 23:18:18 +0000 |
---|---|---|
committer | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 23:18:18 +0000 |
commit | df401535b8d1657c801507a7886a28f0e5c4926d (patch) | |
tree | 88c32324f349861febdb55b1cabeca7bec2072d1 /chrome/common/chrome_content_client.cc | |
parent | 93cfcc6f75ffd86895a6f95013b7df8becccfb91 (diff) | |
download | chromium_src-df401535b8d1657c801507a7886a28f0e5c4926d.zip chromium_src-df401535b8d1657c801507a7886a28f0e5c4926d.tar.gz chromium_src-df401535b8d1657c801507a7886a28f0e5c4926d.tar.bz2 |
Enable pnacl by default
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3560
R=binji@chromium.org, darin@chromium.org, dmichael@chromium.org, jvoung@chromium.org, mseaborn@chromium.org
Review URL: https://codereview.chromium.org/19079002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_content_client.cc')
-rw-r--r-- | chrome/common/chrome_content_client.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 8bd54dd..79ef06c 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -171,7 +171,8 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) { kNaClPluginExtension, kNaClPluginDescription); nacl.mime_types.push_back(nacl_mime_type); - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePnacl)) { + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisablePnacl)) { content::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType, kPnaclPluginExtension, kPnaclPluginDescription); |