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

Unified Diff: chrome/browser/ui/webui/nacl_ui.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/browser/chrome_content_browser_client.cc ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6111748e8e569acce61ff75642ddda0a370f4604..f38de6bae24cc49762b7792cbd9cdfb2b360c9c9 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::kEnablePnacl)) {
- pnacl_enabled_string = ASCIIToUTF16("Not enabled by flag '--enable-pnacl'");
+ } else if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisablePnacl)) {
+ pnacl_enabled_string = ASCIIToUTF16("Disabled by flag '--disable-pnacl'");
}
AddPair(list,
ASCIIToUTF16("Portable Native Client (PNaCl)"),
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/common/chrome_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698