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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/pref_names.h

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.cc ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pref_names.h
===================================================================
--- chrome/common/pref_names.h (revision 184791)
+++ chrome/common/pref_names.h (working copy)
@@ -595,7 +595,7 @@
extern const char kDevToolsVSplitLocation[];
#if defined(OS_ANDROID)
// Used by Chrome Mobile.
-extern const char kSpdyProxyEnabled[];
+extern const char kSpdyProxyAuthEnabled[];
#endif
extern const char kSyncLastSyncedTime[];
extern const char kSyncHasSetupCompleted[];
@@ -755,7 +755,7 @@
extern const char kAuthServerWhitelist[];
extern const char kAuthNegotiateDelegateWhitelist[];
extern const char kGSSAPILibraryName[];
-extern const char kSpdyProxyOrigin[];
+extern const char kSpdyProxyAuthOrigin[];
extern const char kAllowCrossOriginAuthPrompt[];
extern const char kBuiltInDnsClientEnabled[];
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698