summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/base/dns_reloader.cc2
-rw-r--r--net/base/net_util.cc4
-rw-r--r--net/base/network_change_notifier.cc2
-rw-r--r--net/disk_cache/entry_impl.cc4
-rw-r--r--net/disk_cache/file_posix.cc6
-rw-r--r--net/disk_cache/sparse_control.cc4
-rw-r--r--net/dns/dns_config_service_posix.cc4
-rw-r--r--net/ocsp/nss_ocsp.cc7
-rw-r--r--net/proxy/proxy_service.cc7
-rw-r--r--net/socket/client_socket_factory.cc12
-rw-r--r--net/spdy/spdy_session.cc2
-rw-r--r--net/url_request/url_request_http_job.cc18
12 files changed, 37 insertions, 35 deletions
diff --git a/net/base/dns_reloader.cc b/net/base/dns_reloader.cc
index f0a57e6..f90c464 100644
--- a/net/base/dns_reloader.cc
+++ b/net/base/dns_reloader.cc
@@ -84,7 +84,7 @@ class DnsReloader : public net::NetworkChangeNotifier::DNSObserver {
net::NetworkChangeNotifier::AddDNSObserver(this);
}
- ~DnsReloader() {
+ virtual ~DnsReloader() {
NOTREACHED(); // LeakyLazyInstance is not destructed.
}
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index d39d7ab..40c734f 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -836,7 +836,7 @@ class HostComponentTransform : public AppendComponentTransform {
private:
virtual string16 Execute(
const std::string& component_text,
- std::vector<size_t>* offsets_into_component) const {
+ std::vector<size_t>* offsets_into_component) const OVERRIDE {
return IDNToUnicodeWithOffsets(component_text, languages_,
offsets_into_component);
}
@@ -853,7 +853,7 @@ class NonHostComponentTransform : public AppendComponentTransform {
private:
virtual string16 Execute(
const std::string& component_text,
- std::vector<size_t>* offsets_into_component) const {
+ std::vector<size_t>* offsets_into_component) const OVERRIDE {
return (unescape_rules_ == UnescapeRule::NONE) ?
UTF8ToUTF16AndAdjustOffsets(component_text, offsets_into_component) :
UnescapeAndDecodeUTF8URLComponentWithOffsets(component_text,
diff --git a/net/base/network_change_notifier.cc b/net/base/network_change_notifier.cc
index fa0ad77..3f66b45 100644
--- a/net/base/network_change_notifier.cc
+++ b/net/base/network_change_notifier.cc
@@ -31,7 +31,7 @@ NetworkChangeNotifierFactory* g_network_change_notifier_factory = NULL;
class MockNetworkChangeNotifier : public NetworkChangeNotifier {
public:
- virtual ConnectionType GetCurrentConnectionType() const {
+ virtual ConnectionType GetCurrentConnectionType() const OVERRIDE {
return CONNECTION_UNKNOWN;
}
};
diff --git a/net/disk_cache/entry_impl.cc b/net/disk_cache/entry_impl.cc
index 6155aa1..e4eb75a 100644
--- a/net/disk_cache/entry_impl.cc
+++ b/net/disk_cache/entry_impl.cc
@@ -40,9 +40,9 @@ class SyncCallback: public disk_cache::FileIOCallback {
entry->AddRef();
entry->IncrementIoCount();
}
- ~SyncCallback() {}
+ virtual ~SyncCallback() {}
- virtual void OnFileIOComplete(int bytes_copied);
+ virtual void OnFileIOComplete(int bytes_copied) OVERRIDE;
void Discard();
private:
diff --git a/net/disk_cache/file_posix.cc b/net/disk_cache/file_posix.cc
index e03d955..c334f28 100644
--- a/net/disk_cache/file_posix.cc
+++ b/net/disk_cache/file_posix.cc
@@ -49,7 +49,7 @@ class FileBackgroundIO : public disk_cache::BackgroundIO {
void Write();
private:
- ~FileBackgroundIO() {}
+ virtual ~FileBackgroundIO() {}
disk_cache::FileIOCallback* callback_;
@@ -66,7 +66,7 @@ class FileBackgroundIO : public disk_cache::BackgroundIO {
class FileInFlightIO : public disk_cache::InFlightIO {
public:
FileInFlightIO() {}
- ~FileInFlightIO() {}
+ virtual ~FileInFlightIO() {}
// These methods start an asynchronous operation. The arguments have the same
// semantics of the File asynchronous operations, with the exception that the
@@ -82,7 +82,7 @@ class FileInFlightIO : public disk_cache::InFlightIO {
// queued (because we are inside WaitForPendingIO), and false if said task is
// the one performing the call.
virtual void OnOperationComplete(disk_cache::BackgroundIO* operation,
- bool cancel);
+ bool cancel) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(FileInFlightIO);
diff --git a/net/disk_cache/sparse_control.cc b/net/disk_cache/sparse_control.cc
index 136463e..52fd328 100644
--- a/net/disk_cache/sparse_control.cc
+++ b/net/disk_cache/sparse_control.cc
@@ -56,7 +56,7 @@ class ChildrenDeleter
ChildrenDeleter(disk_cache::BackendImpl* backend, const std::string& name)
: backend_(backend->GetWeakPtr()), name_(name), signature_(0) {}
- virtual void OnFileIOComplete(int bytes_copied);
+ virtual void OnFileIOComplete(int bytes_copied) OVERRIDE;
// Two ways of deleting the children: if we have the children map, use Start()
// directly, otherwise pass the data address to ReadData().
@@ -65,7 +65,7 @@ class ChildrenDeleter
private:
friend class base::RefCounted<ChildrenDeleter>;
- ~ChildrenDeleter() {}
+ virtual ~ChildrenDeleter() {}
void DeleteChildren();
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index 70a277e..cd57b44 100644
--- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc
@@ -71,7 +71,7 @@ class ConfigReader : public SerialWorker {
explicit ConfigReader(const CallbackType& callback)
: callback_(callback), success_(false) {}
- void DoWork() OVERRIDE {
+ virtual void DoWork() OVERRIDE {
base::TimeTicks start_time = base::TimeTicks::Now();
ConfigParsePosixResult result = ReadDnsConfig(&dns_config_);
success_ = (result == CONFIG_PARSE_POSIX_OK);
@@ -82,7 +82,7 @@ class ConfigReader : public SerialWorker {
base::TimeTicks::Now() - start_time);
}
- void OnWorkFinished() OVERRIDE {
+ virtual void OnWorkFinished() OVERRIDE {
DCHECK(!IsCancelled());
if (success_) {
callback_.Run(dns_config_);
diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc
index fca6c3d..273e341 100644
--- a/net/ocsp/nss_ocsp.cc
+++ b/net/ocsp/nss_ocsp.cc
@@ -254,7 +254,7 @@ class OCSPRequestSession
virtual void OnReceivedRedirect(net::URLRequest* request,
const GURL& new_url,
- bool* defer_redirect) {
+ bool* defer_redirect) OVERRIDE {
DCHECK_EQ(request, request_);
DCHECK_EQ(MessageLoopForIO::current(), io_loop_);
@@ -265,7 +265,7 @@ class OCSPRequestSession
}
}
- virtual void OnResponseStarted(net::URLRequest* request) {
+ virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE {
DCHECK_EQ(request, request_);
DCHECK_EQ(MessageLoopForIO::current(), io_loop_);
@@ -279,7 +279,8 @@ class OCSPRequestSession
OnReadCompleted(request_, bytes_read);
}
- virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
+ virtual void OnReadCompleted(net::URLRequest* request,
+ int bytes_read) OVERRIDE {
DCHECK_EQ(request, request_);
DCHECK_EQ(MessageLoopForIO::current(), io_loop_);
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 929cefe..7decae8 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -373,9 +373,10 @@ class UnsetProxyConfigService : public ProxyConfigService {
UnsetProxyConfigService() {}
virtual ~UnsetProxyConfigService() {}
- 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 {
return CONFIG_UNSET;
}
};
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index b5b9ca6..f354317 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -64,11 +64,11 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
CertDatabase::RemoveObserver(this);
}
- virtual void OnUserCertAdded(const X509Certificate* cert) {
+ virtual void OnUserCertAdded(const X509Certificate* cert) OVERRIDE {
ClearSSLSessionCache();
}
- virtual void OnCertTrustChanged(const X509Certificate* cert) {
+ virtual void OnCertTrustChanged(const X509Certificate* cert) OVERRIDE {
// Per wtc, we actually only need to flush when trust is reduced.
// Always flush now because OnCertTrustChanged does not tell us this.
// See comments in ClientSocketPoolManager::OnCertTrustChanged.
@@ -79,14 +79,14 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
DatagramSocket::BindType bind_type,
const RandIntCallback& rand_int_cb,
NetLog* net_log,
- const NetLog::Source& source) {
+ const NetLog::Source& source) OVERRIDE {
return new UDPClientSocket(bind_type, rand_int_cb, net_log, source);
}
virtual StreamSocket* CreateTransportClientSocket(
const AddressList& addresses,
NetLog* net_log,
- const NetLog::Source& source) {
+ const NetLog::Source& source) OVERRIDE {
return new TCPClientSocket(addresses, net_log, source);
}
@@ -94,7 +94,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
ClientSocketHandle* transport_socket,
const HostPortPair& host_and_port,
const SSLConfig& ssl_config,
- const SSLClientSocketContext& context) {
+ const SSLClientSocketContext& context) OVERRIDE {
// nss_thread_task_runner_ may be NULL if g_use_dedicated_nss_thread is
// false or if the dedicated NSS thread failed to start. If so, cause NSS
// functions to execute on the current task runner.
@@ -137,7 +137,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
#endif
}
- void ClearSSLSessionCache() {
+ virtual void ClearSSLSessionCache() OVERRIDE {
SSLClientSocket::ClearSessionCache();
}
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 2b73fcc..4b72022 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -1164,7 +1164,7 @@ class SimpleSpdyIOBufferProducer : public SpdySession::SpdyIOBufferProducer {
return priority_;
}
- virtual SpdyIOBuffer* ProduceNextBuffer(SpdySession* session) {
+ virtual SpdyIOBuffer* ProduceNextBuffer(SpdySession* session) OVERRIDE {
return SpdySession::SpdyIOBufferProducer::CreateIOBuffer(
frame_.get(), priority_, NULL);
}
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index a4c1569..80bcbc2 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -55,15 +55,15 @@ class URLRequestHttpJob::HttpFilterContext : public FilterContext {
virtual ~HttpFilterContext();
// FilterContext implementation.
- virtual bool GetMimeType(std::string* mime_type) const;
- virtual bool GetURL(GURL* gurl) const;
- virtual base::Time GetRequestTime() const;
- virtual bool IsCachedContent() const;
- virtual bool IsDownload() const;
- virtual bool IsSdchResponse() const;
- virtual int64 GetByteReadCount() const;
- virtual int GetResponseCode() const;
- virtual void RecordPacketStats(StatisticSelector statistic) const;
+ virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
+ virtual bool GetURL(GURL* gurl) const OVERRIDE;
+ virtual base::Time GetRequestTime() const OVERRIDE;
+ virtual bool IsCachedContent() const OVERRIDE;
+ virtual bool IsDownload() const OVERRIDE;
+ virtual bool IsSdchResponse() const OVERRIDE;
+ virtual int64 GetByteReadCount() const OVERRIDE;
+ virtual int GetResponseCode() const OVERRIDE;
+ virtual void RecordPacketStats(StatisticSelector statistic) const OVERRIDE;
// Method to allow us to reset filter context for a response that should have
// been SDCH encoded when there is an update due to an explicit HTTP header.
generated by cgit v1.1 at 2025-02-07 15:10:16 +0000