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

Unified Diff: chrome/browser/chrome_content_browser_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/browser/about_flags.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 97d276191cd605d375c7edfd10c1c217e583f084..5839accd8637038f24f4e919586805ca5db0d7df 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1431,6 +1431,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kDebugPrint,
switches::kDisableBundledPpapiFlash,
switches::kDisableExtensionsResourceWhitelist,
+ switches::kDisablePnacl,
switches::kDisableScriptedPrintThrottling,
switches::kEnableAdview,
switches::kEnableAdviewSrcAttribute,
@@ -1440,7 +1441,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kEnableNaCl,
switches::kEnableNetBenchmarking,
switches::kEnablePasswordGeneration,
- switches::kEnablePnacl,
switches::kEnableWatchdog,
switches::kMemoryProfiling,
switches::kMessageLoopHistogrammer,
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698