chrome/browser/chromeos/proxy_config_service_impl.h - Issue 14134007: NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

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/proxy_config_service_impl.h

Issue 14134007: NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again 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/net/network_portal_detector_stub.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/proxy_config_service_impl.h

diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h

index 730e003bd968005b9da7a81f12f217f4f9cc42e4..12fac7930a2b7bdc1e17c07accd3d6559cdd1141 100644

--- a/chrome/browser/chromeos/proxy_config_service_impl.h

+++ b/chrome/browser/chromeos/proxy_config_service_impl.h

@@ -198,9 +198,9 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,

virtual void OnNetworkChanged(NetworkLibrary* cros,

const Network* network) OVERRIDE;

- // Parse |network| proxy config and store result in |proxy_config|.

+ // Parse |proxy_config_string| and store result in |proxy_config|.

// Returns true if proxy config was successfully parsed.

- static bool ParseProxyConfig(const Network* network,

+ static bool ParseProxyConfig(const std::string& proxy_config_string,

net::ProxyConfig* proxy_config);

// Register UseShardProxies preference.