diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-19 00:06:02 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-19 00:06:02 +0000 |
commit | 6a6fe806ed0d0b7bf8104815398c3b1f3d766410 (patch) | |
tree | 27aab3442983de794d952800f3005d70877a715c /remoting/jingle_glue | |
parent | 0f9c4556b26ffb55cea457dfeeec9be2924612d1 (diff) | |
download | chromium_src-6a6fe806ed0d0b7bf8104815398c3b1f3d766410.zip chromium_src-6a6fe806ed0d0b7bf8104815398c3b1f3d766410.tar.gz chromium_src-6a6fe806ed0d0b7bf8104815398c3b1f3d766410.tar.bz2 |
Add OVERRIDE to remoting/.
BUG=104314
TEST=no change
Review URL: http://codereview.chromium.org/8601011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
-rw-r--r-- | remoting/jingle_glue/javascript_signal_strategy.h | 2 | ||||
-rw-r--r-- | remoting/jingle_glue/jingle_thread.h | 10 | ||||
-rw-r--r-- | remoting/jingle_glue/ssl_socket_adapter.h | 42 | ||||
-rw-r--r-- | remoting/jingle_glue/xmpp_socket_adapter.h | 18 |
4 files changed, 36 insertions, 36 deletions
diff --git a/remoting/jingle_glue/javascript_signal_strategy.h b/remoting/jingle_glue/javascript_signal_strategy.h index 4c8d991..923dd27 100644 --- a/remoting/jingle_glue/javascript_signal_strategy.h +++ b/remoting/jingle_glue/javascript_signal_strategy.h @@ -37,7 +37,7 @@ class JavascriptSignalStrategy : public SignalStrategy, virtual std::string GetNextId() OVERRIDE; // XmppProxy::ResponseCallback interface. - virtual void OnIq(const std::string& stanza); + virtual void OnIq(const std::string& stanza) OVERRIDE; private: std::string your_jid_; diff --git a/remoting/jingle_glue/jingle_thread.h b/remoting/jingle_glue/jingle_thread.h index aa69153..e78d248 100644 --- a/remoting/jingle_glue/jingle_thread.h +++ b/remoting/jingle_glue/jingle_thread.h @@ -24,11 +24,11 @@ class TaskPump : public talk_base::MessageHandler, TaskPump(); // TaskRunner methods. - virtual void WakeTasks(); - virtual int64 CurrentTime(); + virtual void WakeTasks() OVERRIDE; + virtual int64 CurrentTime() OVERRIDE; // MessageHandler methods. - virtual void OnMessage(talk_base::Message* pmsg); + virtual void OnMessage(talk_base::Message* pmsg) OVERRIDE; }; class JingleThreadMessageLoop : public MessageLoop { @@ -50,10 +50,10 @@ class JingleThread : public talk_base::Thread { void Start(); // Main function for the thread. Should not be called directly. - virtual void Run(); + virtual void Run() OVERRIDE; // Stop the thread. - virtual void Stop(); + virtual void Stop() OVERRIDE; // Returns Chromiums message loop for this thread. MessageLoop* message_loop(); diff --git a/remoting/jingle_glue/ssl_socket_adapter.h b/remoting/jingle_glue/ssl_socket_adapter.h index 2930b47..2e6ebeb 100644 --- a/remoting/jingle_glue/ssl_socket_adapter.h +++ b/remoting/jingle_glue/ssl_socket_adapter.h @@ -41,28 +41,28 @@ class TransportSocket : public net::StreamSocket, public sigslot::has_slots<> { // net::StreamSocket implementation - virtual int Connect(net::OldCompletionCallback* callback); - virtual void Disconnect(); - virtual bool IsConnected() const; - virtual bool IsConnectedAndIdle() const; - virtual int GetPeerAddress(net::AddressList* address) const; - virtual int GetLocalAddress(net::IPEndPoint* address) const; - virtual const net::BoundNetLog& NetLog() const; - virtual void SetSubresourceSpeculation(); - virtual void SetOmniboxSpeculation(); - virtual bool WasEverUsed() const; - virtual bool UsingTCPFastOpen() const; - virtual int64 NumBytesRead() const; - virtual base::TimeDelta GetConnectTimeMicros() const; + virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE; + virtual void Disconnect() OVERRIDE; + virtual bool IsConnected() const OVERRIDE; + virtual bool IsConnectedAndIdle() const OVERRIDE; + virtual int GetPeerAddress(net::AddressList* address) const OVERRIDE; + virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE; + virtual const net::BoundNetLog& NetLog() const OVERRIDE; + virtual void SetSubresourceSpeculation() OVERRIDE; + virtual void SetOmniboxSpeculation() OVERRIDE; + virtual bool WasEverUsed() const OVERRIDE; + virtual bool UsingTCPFastOpen() const OVERRIDE; + virtual int64 NumBytesRead() const OVERRIDE; + virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE; // net::Socket implementation virtual int Read(net::IOBuffer* buf, int buf_len, - net::OldCompletionCallback* callback); + net::OldCompletionCallback* callback) OVERRIDE; virtual int Write(net::IOBuffer* buf, int buf_len, - net::OldCompletionCallback* callback); - virtual bool SetReceiveBufferSize(int32 size); - virtual bool SetSendBufferSize(int32 size); + net::OldCompletionCallback* callback) OVERRIDE; + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; + virtual bool SetSendBufferSize(int32 size) OVERRIDE; private: friend class SSLSocketAdapter; @@ -101,13 +101,13 @@ class SSLSocketAdapter : public talk_base::SSLAdapter { // negotiation will begin as soon as the socket connects. // // restartable is not implemented, and must be set to false. - virtual int StartSSL(const char* hostname, bool restartable); + virtual int StartSSL(const char* hostname, bool restartable) OVERRIDE; // Create the default SSL adapter for this platform. static SSLSocketAdapter* Create(AsyncSocket* socket); - virtual int Send(const void* pv, size_t cb); - virtual int Recv(void* pv, size_t cb); + virtual int Send(const void* pv, size_t cb) OVERRIDE; + virtual int Recv(void* pv, size_t cb) OVERRIDE; private: friend class TransportSocket; @@ -128,7 +128,7 @@ class SSLSocketAdapter : public talk_base::SSLAdapter { void OnRead(int result); void OnWrite(int result); - virtual void OnConnectEvent(talk_base::AsyncSocket* socket); + virtual void OnConnectEvent(talk_base::AsyncSocket* socket) OVERRIDE; int BeginSSL(); diff --git a/remoting/jingle_glue/xmpp_socket_adapter.h b/remoting/jingle_glue/xmpp_socket_adapter.h index 90627cf..953cbcc 100644 --- a/remoting/jingle_glue/xmpp_socket_adapter.h +++ b/remoting/jingle_glue/xmpp_socket_adapter.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -27,19 +27,19 @@ class XmppSocketAdapter : public buzz::AsyncSocket, bool allow_unverified_certs); virtual ~XmppSocketAdapter(); - virtual State state(); - virtual Error error(); - virtual int GetError(); + virtual State state() OVERRIDE; + virtual Error error() OVERRIDE; + virtual int GetError() OVERRIDE; void set_firewall(bool firewall) { firewall_ = firewall; } - virtual bool Connect(const talk_base::SocketAddress& addr); - virtual bool Read(char* data, size_t len, size_t* len_read); - virtual bool Write(const char* data, size_t len); - virtual bool Close(); + virtual bool Connect(const talk_base::SocketAddress& addr) OVERRIDE; + virtual bool Read(char* data, size_t len, size_t* len_read) OVERRIDE; + virtual bool Write(const char* data, size_t len) OVERRIDE; + virtual bool Close() OVERRIDE; #if defined(FEATURE_ENABLE_SSL) - virtual bool StartTls(const std::string& domainname); + virtual bool StartTls(const std::string& domainname) OVERRIDE; bool IsOpen() const { return state_ == STATE_OPEN || state_ == STATE_TLS_OPEN; } #else |