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

Unified Diff: chrome/browser/net/proxy_policy_handler.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/browser/net/proxy_policy_handler.cc
diff --git a/chrome/browser/net/proxy_policy_handler.cc b/chrome/browser/net/proxy_policy_handler.cc
index 6e1024adb988db084522ca52303abd7323c7fd7d..3e0771c1646b59878a72fc626f9eb4b880f450ea 100644
--- a/chrome/browser/net/proxy_policy_handler.cc
+++ b/chrome/browser/net/proxy_policy_handler.cc
@@ -172,18 +172,18 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
switch (proxy_mode) {
case ProxyPrefs::MODE_DIRECT:
- prefs->SetValue(prefs::kProxy,
+ prefs->SetValue(ProxyPrefs::kProxy,
make_scoped_ptr(ProxyConfigDictionary::CreateDirect()));
break;
case ProxyPrefs::MODE_AUTO_DETECT:
prefs->SetValue(
- prefs::kProxy,
+ ProxyPrefs::kProxy,
make_scoped_ptr(ProxyConfigDictionary::CreateAutoDetect()));
break;
case ProxyPrefs::MODE_PAC_SCRIPT: {
std::string pac_url_string;
if (pac_url && pac_url->GetAsString(&pac_url_string)) {
- prefs->SetValue(prefs::kProxy,
+ prefs->SetValue(ProxyPrefs::kProxy,
make_scoped_ptr(ProxyConfigDictionary::CreatePacScript(
pac_url_string, false)));
} else {
@@ -198,14 +198,14 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
if (bypass_list)
bypass_list->GetAsString(&bypass_list_string);
prefs->SetValue(
- prefs::kProxy,
+ ProxyPrefs::kProxy,
make_scoped_ptr(ProxyConfigDictionary::CreateFixedServers(
proxy_server, bypass_list_string)));
}
break;
}
case ProxyPrefs::MODE_SYSTEM:
- prefs->SetValue(prefs::kProxy,
+ prefs->SetValue(ProxyPrefs::kProxy,
make_scoped_ptr(ProxyConfigDictionary::CreateSystem()));
break;
case ProxyPrefs::kModeCount:

Powered by Google App Engine
This is Rietveld 408576698