net/proxy/proxy_info.cc - Issue 851503003: Update from https://crrev.com/311076

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_info.cc

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

Patch Set: Created 5 years, 11 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:

Index: net/proxy/proxy_info.cc

diff --git a/net/proxy/proxy_info.cc b/net/proxy/proxy_info.cc

index 96ae3ce92ed2a5a6c9ae06d17a5e13e444549210..b659d671c22929d96e613a0023c741ca6bd40f0b 100644

--- a/net/proxy/proxy_info.cc

+++ b/net/proxy/proxy_info.cc

@@ -59,6 +59,10 @@ void ProxyInfo::UseProxyList(const ProxyList& proxy_list) {

proxy_list_ = proxy_list;

}

+void ProxyInfo::OverrideProxyList(const ProxyList& proxy_list) {

+ proxy_list_ = proxy_list;

std::string ProxyInfo::ToPacString() const {

return proxy_list_.ToPacString();

}

« no previous file with comments | « net/proxy/proxy_info.h ('k') | net/proxy/proxy_info_unittest.cc » ('j') | no next file with comments »