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

Unified Diff: chrome/common/pref_names.h

Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/out/Debug
Patch Set: Updated to ToT and addressed Matt's comments in base-CL Created 9 years, 11 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
Index: chrome/common/pref_names.h
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 8f2094ba0949571a1e2e9f2cb50b850973aabcac..919b90e92f5fe60d0426ee91653d82e0412c0ecd 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -423,10 +423,7 @@ extern const char kCloudPrintPrintSystemSettings[];
extern const char kRemotingHasSetupCompleted[];
extern const char kRemotingHostEnabled[];
-extern const char kProxyMode[];
-extern const char kProxyServer[];
-extern const char kProxyPacUrl[];
-extern const char kProxyBypassList[];
+extern const char kProxy[];
extern const char kManagedDefaultCookiesSetting[];
extern const char kManagedDefaultImagesSetting[];

Powered by Google App Engine
This is Rietveld 408576698