net/proxy/proxy_service.h - Issue 693943003: Update from https://crrev.com/302630

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: net/proxy/proxy_service.h

Issue 693943003: Update from https://crrev.com/302630 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 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:

Index: net/proxy/proxy_service.h

diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h

index 040a0f83a4d54bfe0ef3edd3f55e7e49c2695123..c4e0fea72b034e3d0c25c12fe01bec8bd00e13c6 100644

--- a/net/proxy/proxy_service.h

+++ b/net/proxy/proxy_service.h

@@ -210,7 +210,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,

}

// Returns the current configuration being used by ProxyConfigService.

- const ProxyConfig& config() {

+ const ProxyConfig& config() const {

return config_;

}