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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/pref_names.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/pref_names.h ('k') | chrome/renderer/page_load_histograms.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pref_names.cc
===================================================================
--- chrome/common/pref_names.cc (revision 184791)
+++ chrome/common/pref_names.cc (working copy)
@@ -1706,7 +1706,7 @@
#if defined(OS_ANDROID)
// A boolean specifying whether a SPDY proxy is enabled.
-const char kSpdyProxyEnabled[] = "spdy_proxy.enabled";
+const char kSpdyProxyAuthEnabled[] = "spdy_proxy.enabled";
#endif
// 64-bit integer serialization of the base::Time when the last sync occurred.
@@ -1926,7 +1926,7 @@
// String that specifies the origin allowed to use SpdyProxy
// authentication, if any.
-const char kSpdyProxyOrigin[] = "auth.spdyproxy.origin";
+const char kSpdyProxyAuthOrigin[] = "auth.spdyproxy.origin";
// Boolean that specifies whether to allow basic auth prompting on cross-
// domain sub-content requests.
« no previous file with comments | « chrome/common/pref_names.h ('k') | chrome/renderer/page_load_histograms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698