net/proxy/proxy_config_service_linux.h - Issue 669813003: Update from chromium https://crrev.com/301725/

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

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

Patch Set: Created 6 years, 2 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_config_service_linux.h

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

index a8438c2c96ff9d4e50ae3299edc5ef74dd7b9981..3d05898c9c31b91b4692228490ad5ed5ec028fde 100644

--- a/net/proxy/proxy_config_service_linux.h

+++ b/net/proxy/proxy_config_service_linux.h

@@ -280,7 +280,7 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService {

ProxyConfigServiceLinux(base::Environment* env_var_getter,

SettingGetter* setting_getter);

- virtual ~ProxyConfigServiceLinux();

+ ~ProxyConfigServiceLinux() override;

void SetupAndFetchInitialConfig(

const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,

@@ -296,9 +296,9 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceLinux : public ProxyConfigService {

// ProxyConfigService methods:

// Called from IO thread.

- virtual void AddObserver(Observer* observer) override;

- virtual void RemoveObserver(Observer* observer) override;

- virtual ProxyConfigService::ConfigAvailability GetLatestProxyConfig(

+ void AddObserver(Observer* observer) override;

+ void RemoveObserver(Observer* observer) override;

+ ProxyConfigService::ConfigAvailability GetLatestProxyConfig(

ProxyConfig* config) override;

private:

« no previous file with comments | « net/ocsp/nss_ocsp_unittest.cc ('k') | net/proxy/proxy_config_service_linux.cc » ('j') | no next file with comments »