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

Unified Diff: chrome/browser/chromeos/proxy_cros_settings_parser.cc

Issue 2445153002: Move onc and proxy pref names to components. (Closed)
Patch Set: ONC_EXPORT Created 4 years, 2 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/browser/chromeos/proxy_cros_settings_parser.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/proxy_cros_settings_parser.cc
diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
index 3e94c7680b6a760c62bb561d11a7646081227e73..4f7b43ce9f3e5dbfc2ab1fec1ebfdcecb2d4b8e7 100644
--- a/chrome/browser/chromeos/proxy_cros_settings_parser.cc
+++ b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
@@ -14,48 +14,6 @@
namespace chromeos {
-// Common prefix of all proxy prefs.
-const char kProxyPrefsPrefix[] = "cros.session.proxy";
-
-// Names of proxy preferences.
-const char kProxyPacUrl[] = "cros.session.proxy.pacurl";
-const char kProxySingleHttp[] = "cros.session.proxy.singlehttp";
-const char kProxySingleHttpPort[] = "cros.session.proxy.singlehttpport";
-const char kProxyHttpUrl[] = "cros.session.proxy.httpurl";
-const char kProxyHttpPort[] = "cros.session.proxy.httpport";
-const char kProxyHttpsUrl[] = "cros.session.proxy.httpsurl";
-const char kProxyHttpsPort[] = "cros.session.proxy.httpsport";
-const char kProxyType[] = "cros.session.proxy.type";
-const char kProxySingle[] = "cros.session.proxy.single";
-const char kProxyFtpUrl[] = "cros.session.proxy.ftpurl";
-const char kProxyFtpPort[] = "cros.session.proxy.ftpport";
-const char kProxySocks[] = "cros.session.proxy.socks";
-const char kProxySocksPort[] = "cros.session.proxy.socksport";
-const char kProxyIgnoreList[] = "cros.session.proxy.ignorelist";
-const char kProxyUsePacUrl[] = "cros.session.proxy.usepacurl";
-
-const char* const kProxySettings[] = {
- kProxyPacUrl,
- kProxySingleHttp,
- kProxySingleHttpPort,
- kProxyHttpUrl,
- kProxyHttpPort,
- kProxyHttpsUrl,
- kProxyHttpsPort,
- kProxyType,
- kProxySingle,
- kProxyFtpUrl,
- kProxyFtpPort,
- kProxySocks,
- kProxySocksPort,
- kProxyIgnoreList,
- kProxyUsePacUrl,
-};
-
-// We have to explicitly export this because the arraysize macro doesn't like
-// extern arrays as their size is not known on compile time.
-const size_t kProxySettingsCount = arraysize(kProxySettings);
-
namespace {
base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) {
@@ -114,6 +72,37 @@ net::ProxyServer CreateProxyServerFromPort(
namespace proxy_cros_settings_parser {
+// Common prefix of all proxy prefs.
+const char kProxyPrefsPrefix[] = "cros.session.proxy";
+
+// Names of proxy preferences.
+const char kProxyPacUrl[] = "cros.session.proxy.pacurl";
+const char kProxySingleHttp[] = "cros.session.proxy.singlehttp";
+const char kProxySingleHttpPort[] = "cros.session.proxy.singlehttpport";
+const char kProxyHttpUrl[] = "cros.session.proxy.httpurl";
+const char kProxyHttpPort[] = "cros.session.proxy.httpport";
+const char kProxyHttpsUrl[] = "cros.session.proxy.httpsurl";
+const char kProxyHttpsPort[] = "cros.session.proxy.httpsport";
+const char kProxyType[] = "cros.session.proxy.type";
+const char kProxySingle[] = "cros.session.proxy.single";
+const char kProxyFtpUrl[] = "cros.session.proxy.ftpurl";
+const char kProxyFtpPort[] = "cros.session.proxy.ftpport";
+const char kProxySocks[] = "cros.session.proxy.socks";
+const char kProxySocksPort[] = "cros.session.proxy.socksport";
+const char kProxyIgnoreList[] = "cros.session.proxy.ignorelist";
+const char kProxyUsePacUrl[] = "cros.session.proxy.usepacurl";
+
+const char* const kProxySettings[] = {
+ kProxyPacUrl, kProxySingleHttp, kProxySingleHttpPort, kProxyHttpUrl,
+ kProxyHttpPort, kProxyHttpsUrl, kProxyHttpsPort, kProxyType,
+ kProxySingle, kProxyFtpUrl, kProxyFtpPort, kProxySocks,
+ kProxySocksPort, kProxyIgnoreList, kProxyUsePacUrl,
+};
+
+// We have to explicitly export this because the arraysize macro doesn't like
+// extern arrays as their size is not known on compile time.
+const size_t kProxySettingsCount = arraysize(kProxySettings);
+
bool IsProxyPref(const std::string& path) {
return base::StartsWith(path, kProxyPrefsPrefix,
base::CompareCase::SENSITIVE);
« no previous file with comments | « chrome/browser/chromeos/proxy_cros_settings_parser.h ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698