| Index: chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h
|
| diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h
|
| index 72c7d4926a00fdf8378f49424d51c55deb5f1dd5..67fd4aa83a1351806504aa886a13e11be5ace579 100644
|
| --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h
|
| +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_configurator.h
|
| @@ -36,20 +36,20 @@ class DataReductionProxyChromeConfigurator
|
| bool fallback_restricted,
|
| const std::string& primary_origin,
|
| const std::string& fallback_origin,
|
| - const std::string& ssl_origin) OVERRIDE;
|
| - virtual void Disable() OVERRIDE;
|
| + const std::string& ssl_origin) override;
|
| + virtual void Disable() override;
|
|
|
| // Add a host pattern to bypass. This should follow the same syntax used
|
| // in net::ProxyBypassRules; that is, a hostname pattern, a hostname suffix
|
| // pattern, an IP literal, a CIDR block, or the magic string '<local>'.
|
| // Bypass settings persist for the life of this object and are applied
|
| // each time the proxy is enabled, but are not updated while it is enabled.
|
| - virtual void AddHostPatternToBypass(const std::string& pattern) OVERRIDE;
|
| + virtual void AddHostPatternToBypass(const std::string& pattern) override;
|
|
|
| // Add a URL pattern to bypass the proxy. The base implementation strips
|
| // everything in |pattern| after the first single slash and then treats it
|
| // as a hostname pattern. Subclasses may implement other semantics.
|
| - virtual void AddURLPatternToBypass(const std::string& pattern) OVERRIDE;
|
| + virtual void AddURLPatternToBypass(const std::string& pattern) override;
|
|
|
| // Updates the config for use on the IO thread.
|
| void UpdateProxyConfigOnIO(const net::ProxyConfig& config);
|
|
|