chrome/browser/net/proxy_service_factory.h - Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW

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_service_factory.h

Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: try merging again... 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

Index: chrome/browser/net/proxy_service_factory.h

diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/proxy_service_factory.h

index 2952ff27ec52240a9cd4648f8bbbd46f2df57aa9..8faa49161623df5af338d0f29032e14c0115fd70 100644

--- a/chrome/browser/net/proxy_service_factory.h

+++ b/chrome/browser/net/proxy_service_factory.h

@@ -49,7 +49,7 @@ class ProxyServiceFactory {

net::NetLog* net_log,

net::URLRequestContext* context,

net::NetworkDelegate* network_delegate,

- net::ProxyConfigService* proxy_config_service,

+ scoped_ptr<net::ProxyConfigService> proxy_config_service,

const base::CommandLine& command_line,

bool quick_check_enabled);

« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/net/proxy_service_factory.cc » ('j') | no next file with comments »