Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6974)

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 23326003: Enable PNaCl by default (revert disabling CL) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for Jan's comments. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/renderer/pepper/ppb_nacl_private_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index e65f423ae58b19d57932b6ca3bc6c9fa9ca0e709..3c71092d4af3ac800409ac0f0339e41bd304192c 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -574,12 +574,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,
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/renderer/pepper/ppb_nacl_private_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698