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/renderer | |
| 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/renderer')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 7 | ||||
| -rw-r--r-- | chrome/renderer/pepper/ppb_nacl_private_impl.cc | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index f0262c0..603d8e1 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -570,12 +570,13 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( case ChromeViewHostMsg_GetPluginInfo_Status::kAllowed: { const char* kPnaclMimeType = "application/x-pnacl"; if (actual_mime_type == kPnaclMimeType) { - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnablePnacl)) { + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisablePnacl)) { frame->addMessageToConsole( WebConsoleMessage( WebConsoleMessage::LevelError, - "Portable Native Client must be enabled in about:flags.")); + "Portable Native Client must not be disabled in" + " about:flags.")); placeholder = PluginPlaceholder::CreateBlockedPlugin( render_view, frame, params, plugin, identifier, group_name, IDR_BLOCKED_PLUGIN_HTML, diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc index 2c8d603..f334bd0 100644 --- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc +++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc @@ -294,7 +294,7 @@ PP_Bool IsOffTheRecord() { PP_Bool IsPnaclEnabled() { return PP_FromBool( - CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePnacl)); + !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisablePnacl)); } PP_ExternalPluginResult ReportNaClError(PP_Instance instance, |