summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_content_browser_client.cc
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-08 21:00:29 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-08 21:00:29 +0000
commit45a9c0aa35cc234293ed396b47c72c8ca04a06dd (patch)
tree560e5e771aa857fc3a6f77c24552c8fc01a5ebba /chrome/browser/chrome_content_browser_client.cc
parent8d3c7d6e06e31def105c6aa29c003f37fdf52da5 (diff)
downloadchromium_src-45a9c0aa35cc234293ed396b47c72c8ca04a06dd.zip
chromium_src-45a9c0aa35cc234293ed396b47c72c8ca04a06dd.tar.gz
chromium_src-45a9c0aa35cc234293ed396b47c72c8ca04a06dd.tar.bz2
Make the Chrome IPC-based proxy the default for Native Client.
This change removes --enable-nacl-ipc-proxy and adds --enable-nacl-srpc-proxy. The IPC PPAPI proxy is now the default. BUG=116317 TEST=manual Review URL: https://codereview.chromium.org/11358023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
-rw-r--r--chrome/browser/chrome_content_browser_client.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 758eb51..000da0d 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -946,7 +946,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kEnableExperimentalExtensionApis,
switches::kEnableIPCFuzzing,
switches::kEnableNaCl,
- switches::kEnableNaClIPCProxy,
+ switches::kEnableNaClSRPCProxy,
switches::kEnablePasswordGeneration,
switches::kEnablePnacl,
switches::kEnableWatchdog,