Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1219)

Unified Diff: components/proxy_config/pref_proxy_config_tracker_impl.h

Issue 2972223002: Revert https://codereview.chromium.org/2860033003 (Closed)
Patch Set: Created 3 years, 5 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: components/proxy_config/pref_proxy_config_tracker_impl.h
diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.h b/components/proxy_config/pref_proxy_config_tracker_impl.h
index d8a22f6793fdff791a26233c7a30b1d0274ed8bf..ec42a7922179569ea2f3d8d05ecacf64b131941a 100644
--- a/components/proxy_config/pref_proxy_config_tracker_impl.h
+++ b/components/proxy_config/pref_proxy_config_tracker_impl.h
@@ -36,9 +36,10 @@ class PrefRegistrySyncable;
class ProxyConfigServiceImpl : public net::ProxyConfigService,
public net::ProxyConfigService::Observer {
public:
- ProxyConfigServiceImpl(std::unique_ptr<net::ProxyConfigService> base_service,
- ProxyPrefs::ConfigState initial_config_state,
- const net::ProxyConfig& initial_config);
+ // Takes ownership of the passed |base_service|.
+ // GetLatestProxyConfig returns ConfigAvailability::CONFIG_PENDING until
+ // UpdateProxyConfig has been called.
+ explicit ProxyConfigServiceImpl(net::ProxyConfigService* base_service);
~ProxyConfigServiceImpl() override;
// ProxyConfigService implementation:
@@ -70,6 +71,10 @@ class ProxyConfigServiceImpl : public net::ProxyConfigService,
// Configuration as defined by prefs.
net::ProxyConfig pref_config_;
+ // Flag that indicates that a PrefProxyConfigTracker needs to inform us
+ // about a proxy configuration before we may return any configuration.
+ bool pref_config_read_pending_;
+
// Indicates whether the base service registration is done.
bool registered_observer_;
« no previous file with comments | « components/proxy_config/pref_proxy_config_tracker.h ('k') | components/proxy_config/pref_proxy_config_tracker_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698