chrome/browser/chromeos/net/onc_utils.cc - Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

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/chromeos/net/onc_utils.cc

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 7 years, 7 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/login/proxy_settings_dialog.cc ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/onc_utils.cc

diff --git a/chrome/browser/chromeos/net/onc_utils.cc b/chrome/browser/chromeos/net/onc_utils.cc

index 71ba2b9eb3e9838ff7acf22f68325fcc4d603c78..0ce54dbd6bf321faa5b3178dd57afa0b4af9a58b 100644

--- a/chrome/browser/chromeos/net/onc_utils.cc

+++ b/chrome/browser/chromeos/net/onc_utils.cc

@@ -4,11 +4,14 @@

#include "chrome/browser/chromeos/net/onc_utils.h"

+#include "base/logging.h"

#include "base/values.h"

-#include "chrome/browser/chromeos/proxy_config_service_impl.h"

+#include "chrome/browser/chromeos/ui_proxy_config.h"

#include "chrome/browser/prefs/proxy_config_dictionary.h"

#include "chromeos/network/onc/onc_utils.h"

#include "googleurl/src/gurl.h"

+#include "net/base/host_port_pair.h"

+#include "net/proxy/proxy_bypass_rules.h"

#include "net/proxy/proxy_server.h"

namespace chromeos {

@@ -62,8 +65,7 @@ void AppendProxyServerForScheme(

net::ProxyServer proxy_server = ConvertOncProxyLocationToHostPort(

default_proxy_scheme, *onc_proxy_location);

- ProxyConfigServiceImpl::ProxyConfig::EncodeAndAppendProxyServer(

- url_scheme, proxy_server, spec);

+ UIProxyConfig::EncodeAndAppendProxyServer(url_scheme, proxy_server, spec);

}

net::ProxyBypassRules ConvertOncExcludeDomainsToBypassRules(