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

Side by Side 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, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" 5 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chromeos/ui_proxy_config.h" 12 #include "chrome/browser/chromeos/ui_proxy_config.h"
13 #include "chrome/browser/chromeos/ui_proxy_config_service.h" 13 #include "chrome/browser/chromeos/ui_proxy_config_service.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
17 // Common prefix of all proxy prefs.
18 const char kProxyPrefsPrefix[] = "cros.session.proxy";
19
20 // Names of proxy preferences.
21 const char kProxyPacUrl[] = "cros.session.proxy.pacurl";
22 const char kProxySingleHttp[] = "cros.session.proxy.singlehttp";
23 const char kProxySingleHttpPort[] = "cros.session.proxy.singlehttpport";
24 const char kProxyHttpUrl[] = "cros.session.proxy.httpurl";
25 const char kProxyHttpPort[] = "cros.session.proxy.httpport";
26 const char kProxyHttpsUrl[] = "cros.session.proxy.httpsurl";
27 const char kProxyHttpsPort[] = "cros.session.proxy.httpsport";
28 const char kProxyType[] = "cros.session.proxy.type";
29 const char kProxySingle[] = "cros.session.proxy.single";
30 const char kProxyFtpUrl[] = "cros.session.proxy.ftpurl";
31 const char kProxyFtpPort[] = "cros.session.proxy.ftpport";
32 const char kProxySocks[] = "cros.session.proxy.socks";
33 const char kProxySocksPort[] = "cros.session.proxy.socksport";
34 const char kProxyIgnoreList[] = "cros.session.proxy.ignorelist";
35 const char kProxyUsePacUrl[] = "cros.session.proxy.usepacurl";
36
37 const char* const kProxySettings[] = {
38 kProxyPacUrl,
39 kProxySingleHttp,
40 kProxySingleHttpPort,
41 kProxyHttpUrl,
42 kProxyHttpPort,
43 kProxyHttpsUrl,
44 kProxyHttpsPort,
45 kProxyType,
46 kProxySingle,
47 kProxyFtpUrl,
48 kProxyFtpPort,
49 kProxySocks,
50 kProxySocksPort,
51 kProxyIgnoreList,
52 kProxyUsePacUrl,
53 };
54
55 // We have to explicitly export this because the arraysize macro doesn't like
56 // extern arrays as their size is not known on compile time.
57 const size_t kProxySettingsCount = arraysize(kProxySettings);
58
59 namespace { 17 namespace {
60 18
61 base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) { 19 base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) {
62 return proxy.server.is_valid() ? 20 return proxy.server.is_valid() ?
63 new base::StringValue(proxy.server.host_port_pair().host()) : 21 new base::StringValue(proxy.server.host_port_pair().host()) :
64 NULL; 22 NULL;
65 } 23 }
66 24
67 base::Value* CreateServerPortValue(const UIProxyConfig::ManualProxy& proxy) { 25 base::Value* CreateServerPortValue(const UIProxyConfig::ManualProxy& proxy) {
68 return proxy.server.is_valid() 26 return proxy.server.is_valid()
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 std::string host; 65 std::string host;
108 if (proxy.server.is_valid()) 66 if (proxy.server.is_valid())
109 host = proxy.server.host_port_pair().host(); 67 host = proxy.server.host_port_pair().host();
110 return CreateProxyServer(host, port, scheme); 68 return CreateProxyServer(host, port, scheme);
111 } 69 }
112 70
113 } // namespace 71 } // namespace
114 72
115 namespace proxy_cros_settings_parser { 73 namespace proxy_cros_settings_parser {
116 74
75 // Common prefix of all proxy prefs.
76 const char kProxyPrefsPrefix[] = "cros.session.proxy";
77
78 // Names of proxy preferences.
79 const char kProxyPacUrl[] = "cros.session.proxy.pacurl";
80 const char kProxySingleHttp[] = "cros.session.proxy.singlehttp";
81 const char kProxySingleHttpPort[] = "cros.session.proxy.singlehttpport";
82 const char kProxyHttpUrl[] = "cros.session.proxy.httpurl";
83 const char kProxyHttpPort[] = "cros.session.proxy.httpport";
84 const char kProxyHttpsUrl[] = "cros.session.proxy.httpsurl";
85 const char kProxyHttpsPort[] = "cros.session.proxy.httpsport";
86 const char kProxyType[] = "cros.session.proxy.type";
87 const char kProxySingle[] = "cros.session.proxy.single";
88 const char kProxyFtpUrl[] = "cros.session.proxy.ftpurl";
89 const char kProxyFtpPort[] = "cros.session.proxy.ftpport";
90 const char kProxySocks[] = "cros.session.proxy.socks";
91 const char kProxySocksPort[] = "cros.session.proxy.socksport";
92 const char kProxyIgnoreList[] = "cros.session.proxy.ignorelist";
93 const char kProxyUsePacUrl[] = "cros.session.proxy.usepacurl";
94
95 const char* const kProxySettings[] = {
96 kProxyPacUrl, kProxySingleHttp, kProxySingleHttpPort, kProxyHttpUrl,
97 kProxyHttpPort, kProxyHttpsUrl, kProxyHttpsPort, kProxyType,
98 kProxySingle, kProxyFtpUrl, kProxyFtpPort, kProxySocks,
99 kProxySocksPort, kProxyIgnoreList, kProxyUsePacUrl,
100 };
101
102 // We have to explicitly export this because the arraysize macro doesn't like
103 // extern arrays as their size is not known on compile time.
104 const size_t kProxySettingsCount = arraysize(kProxySettings);
105
117 bool IsProxyPref(const std::string& path) { 106 bool IsProxyPref(const std::string& path) {
118 return base::StartsWith(path, kProxyPrefsPrefix, 107 return base::StartsWith(path, kProxyPrefsPrefix,
119 base::CompareCase::SENSITIVE); 108 base::CompareCase::SENSITIVE);
120 } 109 }
121 110
122 void SetProxyPrefValue(const std::string& path, 111 void SetProxyPrefValue(const std::string& path,
123 const base::Value* in_value, 112 const base::Value* in_value,
124 UIProxyConfigService* config_service) { 113 UIProxyConfigService* config_service) {
125 if (!in_value) { 114 if (!in_value) {
126 NOTREACHED(); 115 NOTREACHED();
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 } else { 366 } else {
378 dict->SetBoolean("disabled", false); 367 dict->SetBoolean("disabled", false);
379 } 368 }
380 *out_value = dict; 369 *out_value = dict;
381 return true; 370 return true;
382 } 371 }
383 372
384 } // namespace proxy_cros_settings_parser 373 } // namespace proxy_cros_settings_parser
385 374
386 } // namespace chromeos 375 } // namespace chromeos
OLDNEW
« 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