chrome/browser/net/proxy_policy_handler.cc - Issue 1296663003: Componentize proxy code from chrome/browser/net

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: updating for win p/f 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

« no previous file with comments | « chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc ('k') | chrome/browser/net/proxy_policy_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..591fc2a0f43d134fad85b05b4656627d639ca439 100644

--- a/chrome/browser/net/proxy_policy_handler.cc

+++ b/chrome/browser/net/proxy_policy_handler.cc

@@ -13,7 +13,7 @@

#include "components/policy/core/browser/policy_error_map.h"

#include "components/policy/core/common/policy_map.h"

#include "components/proxy_config/proxy_config_dictionary.h"

-#include "components/proxy_config/proxy_prefs.h"

+#include "components/proxy_config/proxy_config_pref_names.h"

#include "grit/components_strings.h"

#include "policy/policy_constants.h"

@@ -172,18 +172,18 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,

switch (proxy_mode) {

case ProxyPrefs::MODE_DIRECT:

- prefs->SetValue(prefs::kProxy,

+ prefs->SetValue(proxy_config::prefs::kProxy,

make_scoped_ptr(ProxyConfigDictionary::CreateDirect()));

break;

case ProxyPrefs::MODE_AUTO_DETECT:

prefs->SetValue(

- prefs::kProxy,

+ proxy_config::prefs::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(proxy_config::prefs::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,

+ proxy_config::prefs::kProxy,

make_scoped_ptr(ProxyConfigDictionary::CreateFixedServers(

proxy_server, bypass_list_string)));

}

break;

}

case ProxyPrefs::MODE_SYSTEM:

- prefs->SetValue(prefs::kProxy,

+ prefs->SetValue(proxy_config::prefs::kProxy,

make_scoped_ptr(ProxyConfigDictionary::CreateSystem()));

break;

case ProxyPrefs::kModeCount: