| Index: chrome/browser/net/pref_proxy_config_tracker_impl.h
|
| diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.h b/chrome/browser/net/pref_proxy_config_tracker_impl.h
|
| index a96faf65636074691dffce8d48c92f2e14fcc639..9868a5e3d108eb9567c19a47ed2ebe91dba2d263 100644
|
| --- a/chrome/browser/net/pref_proxy_config_tracker_impl.h
|
| +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.h
|
| @@ -32,10 +32,13 @@ class ChromeProxyConfigService
|
| virtual ~ChromeProxyConfigService();
|
|
|
| // ProxyConfigService implementation:
|
| - virtual void AddObserver(net::ProxyConfigService::Observer* observer);
|
| - virtual void RemoveObserver(net::ProxyConfigService::Observer* observer);
|
| - virtual ConfigAvailability GetLatestProxyConfig(net::ProxyConfig* config);
|
| - virtual void OnLazyPoll();
|
| + virtual void AddObserver(
|
| + net::ProxyConfigService::Observer* observer) OVERRIDE;
|
| + virtual void RemoveObserver(
|
| + net::ProxyConfigService::Observer* observer) OVERRIDE;
|
| + virtual ConfigAvailability GetLatestProxyConfig(
|
| + net::ProxyConfig* config) OVERRIDE;
|
| + virtual void OnLazyPoll() OVERRIDE;
|
|
|
| // Method on IO thread that receives the preference proxy settings pushed from
|
| // PrefProxyConfigTrackerImpl.
|
| @@ -45,7 +48,7 @@ class ChromeProxyConfigService
|
| private:
|
| // ProxyConfigService::Observer implementation:
|
| virtual void OnProxyConfigChanged(const net::ProxyConfig& config,
|
| - ConfigAvailability availability);
|
| + ConfigAvailability availability) OVERRIDE;
|
|
|
| // Makes sure that the observer registration with the base service is set up.
|
| void RegisterObserver();
|
| @@ -121,7 +124,7 @@ class PrefProxyConfigTrackerImpl : public content::NotificationObserver {
|
| // content::NotificationObserver implementation:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| - const content::NotificationDetails& details);
|
| + const content::NotificationDetails& details) OVERRIDE;
|
|
|
| // Converts a ProxyConfigDictionary to net::ProxyConfig representation.
|
| // Returns true if the data from in the dictionary is valid, false otherwise.
|
|
|