summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.cc
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 17:24:26 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 17:24:26 +0000
commitc4c1b4834a125836e813a8297e2199073977d671 (patch)
treef51c1d124a7749a60e1cd625f71a0be11c15e556 /net/proxy/proxy_service.cc
parent800df5fae2689382fd79163979bd701869164c67 (diff)
downloadchromium_src-c4c1b4834a125836e813a8297e2199073977d671.zip
chromium_src-c4c1b4834a125836e813a8297e2199073977d671.tar.gz
chromium_src-c4c1b4834a125836e813a8297e2199073977d671.tar.bz2
Add OVERRIDE throughout net/proxy/*
In the process I discovered 2 dummy virtual overrides of NetworkDelegate interface. (Interface it was trying to overwrite no longer exists). Review URL: http://codereview.chromium.org/7484010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
-rw-r--r--net/proxy/proxy_service.cc29
1 files changed, 15 insertions, 14 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 31e20c5..d9173fb 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -91,9 +91,10 @@ const int64 kNumMillisToStallAfterNetworkChanges = 2000;
class ProxyConfigServiceDirect : public ProxyConfigService {
public:
// ProxyConfigService implementation:
- virtual void AddObserver(Observer* observer) {}
- virtual void RemoveObserver(Observer* observer) {}
- virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) {
+ virtual void AddObserver(Observer* observer) OVERRIDE {}
+ virtual void RemoveObserver(Observer* observer) OVERRIDE {}
+ virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config)
+ OVERRIDE {
*config = ProxyConfig::CreateDirect();
return CONFIG_VALID;
}
@@ -109,21 +110,21 @@ class ProxyResolverNull : public ProxyResolver {
ProxyInfo* results,
CompletionCallback* callback,
RequestHandle* request,
- const BoundNetLog& net_log) {
+ const BoundNetLog& net_log) OVERRIDE {
return ERR_NOT_IMPLEMENTED;
}
- virtual void CancelRequest(RequestHandle request) {
+ virtual void CancelRequest(RequestHandle request) OVERRIDE {
NOTREACHED();
}
- virtual void CancelSetPacScript() {
+ virtual void CancelSetPacScript() OVERRIDE {
NOTREACHED();
}
virtual int SetPacScript(
const scoped_refptr<ProxyResolverScriptData>& /*script_data*/,
- CompletionCallback* /*callback*/) {
+ CompletionCallback* /*callback*/) OVERRIDE {
return ERR_NOT_IMPLEMENTED;
}
};
@@ -140,22 +141,22 @@ class ProxyResolverFromPacString : public ProxyResolver {
ProxyInfo* results,
CompletionCallback* callback,
RequestHandle* request,
- const BoundNetLog& net_log) {
+ const BoundNetLog& net_log) OVERRIDE {
results->UsePacString(pac_string_);
return OK;
}
- virtual void CancelRequest(RequestHandle request) {
+ virtual void CancelRequest(RequestHandle request) OVERRIDE {
NOTREACHED();
}
- virtual void CancelSetPacScript() {
+ virtual void CancelSetPacScript() OVERRIDE {
NOTREACHED();
}
virtual int SetPacScript(
const scoped_refptr<ProxyResolverScriptData>& pac_script,
- CompletionCallback* callback) {
+ CompletionCallback* callback) OVERRIDE {
return OK;
}
@@ -183,7 +184,7 @@ class ProxyResolverFactoryForV8 : public ProxyResolverFactory {
network_delegate_(network_delegate) {
}
- virtual ProxyResolver* CreateProxyResolver() {
+ virtual ProxyResolver* CreateProxyResolver() OVERRIDE {
// Create a synchronous host resolver wrapper that operates
// |async_host_resolver_| on |io_loop_|.
SyncHostResolverBridge* sync_host_resolver =
@@ -217,7 +218,7 @@ class ProxyResolverFactoryForSystem : public ProxyResolverFactory {
ProxyResolverFactoryForSystem()
: ProxyResolverFactory(false /*expects_pac_bytes*/) {}
- virtual ProxyResolver* CreateProxyResolver() {
+ virtual ProxyResolver* CreateProxyResolver() OVERRIDE {
DCHECK(IsSupported());
#if defined(OS_WIN)
return new ProxyResolverWinHttp();
@@ -247,7 +248,7 @@ class ProxyConfigChangedNetLogParam : public NetLog::EventParameters {
new_config_(new_config) {
}
- virtual Value* ToValue() const {
+ virtual Value* ToValue() const OVERRIDE {
DictionaryValue* dict = new DictionaryValue();
// The "old_config" is optional -- the first notification will not have
// any "previous" configuration.