chrome/browser/ui/webui/nacl_ui.cc - Issue 22839005: disable pnacl by default

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/browser/ui/webui/nacl_ui.cc

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove some unintended revert changes 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/browser/ui/webui/nacl_ui.cc

diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc

index f38de6bae24cc49762b7792cbd9cdfb2b360c9c9..6111748e8e569acce61ff75642ddda0a370f4604 100644

--- a/chrome/browser/ui/webui/nacl_ui.cc

+++ b/chrome/browser/ui/webui/nacl_ui.cc

@@ -249,9 +249,9 @@ void NaClDomHandler::AddPnaclInfo(ListValue* list) {

string16 pnacl_enabled_string = ASCIIToUTF16("Enabled");

if (!isPluginEnabled(0)) {

pnacl_enabled_string = ASCIIToUTF16("Disabled in profile prefs");

- } else if (CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisablePnacl)) {

- pnacl_enabled_string = ASCIIToUTF16("Disabled by flag '--disable-pnacl'");

+ } else if (!CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kEnablePnacl)) {

+ pnacl_enabled_string = ASCIIToUTF16("Not enabled by flag '--enable-pnacl'");

}

AddPair(list,

ASCIIToUTF16("Portable Native Client (PNaCl)"),