chrome/common/chrome_content_client.cc - Issue 23326003: Enable PNaCl by default (revert disabling CL)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/chrome_content_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:

Index: chrome/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index 46f40691353a720abc47f2f29d4e62d22492d654..cfaa40e30e2f26fa1220d7a18d517789e802784f 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -172,7 +172,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);

« no previous file with comments | « chrome/browser/ui/webui/nacl_ui.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »