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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/chrome_switches.cc

Issue 12316144: Merge 183832 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 years, 10 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/common/chrome_switches.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_switches.cc
===================================================================
--- chrome/common/chrome_switches.cc (revision 184791)
+++ chrome/common/chrome_switches.cc (working copy)
@@ -1222,7 +1222,7 @@
const char kSocketReusePolicy[] = "socket-reuse-policy";
// Origin for which SpdyProxy authentication is supported.
-const char kSpdyProxyOrigin[] = "spdy-proxy-origin";
+const char kSpdyProxyAuthOrigin[] = "spdy-proxy-auth-origin";
// Speculative resource prefetching.
const char kSpeculativeResourcePrefetching[] =
@@ -1398,7 +1398,7 @@
#if defined(OS_ANDROID)
// Enable SPDY proxy.
-const char kEnableSpdyProxy[] = "enable-spdy-proxy";
+const char kEnableSpdyProxyAuth[] = "enable-spdy-proxy-auth";
// Pops the translate infobar if possible.
const char kEnableTranslate[] = "enable-translate";
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698