summaryrefslogtreecommitdiffstats
path: root/jingle/notifier/base
diff options
context:
space:
mode:
Diffstat (limited to 'jingle/notifier/base')
-rw-r--r--jingle/notifier/base/chrome_async_socket.h17
-rw-r--r--jingle/notifier/base/fake_ssl_client_socket.h35
-rw-r--r--jingle/notifier/base/gaia_token_pre_xmpp_auth.h19
-rw-r--r--jingle/notifier/base/proxy_resolving_client_socket.h1
-rw-r--r--jingle/notifier/base/task_pump.h5
-rw-r--r--jingle/notifier/base/weak_xmpp_client.h3
-rw-r--r--jingle/notifier/base/xmpp_client_socket_factory.h5
7 files changed, 46 insertions, 39 deletions
diff --git a/jingle/notifier/base/chrome_async_socket.h b/jingle/notifier/base/chrome_async_socket.h
index 75c8873..6e41a6c 100644
--- a/jingle/notifier/base/chrome_async_socket.h
+++ b/jingle/notifier/base/chrome_async_socket.h
@@ -15,6 +15,7 @@
#include <vector>
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -45,16 +46,16 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
// The current state (see buzz::AsyncSocket::State; all but
// STATE_CLOSING is used).
- virtual State state();
+ virtual State state() OVERRIDE;
// The last generated error. Errors are generated when the main
// functions below return false or when SignalClosed is raised due
// to an asynchronous error.
- virtual Error error();
+ virtual Error error() OVERRIDE;
// GetError() (which is of type net::Error) != net::OK only when
// error() == ERROR_WINSOCK.
- virtual int GetError();
+ virtual int GetError() OVERRIDE;
// Tries to connect to the given address.
//
@@ -67,7 +68,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
// Otherwise, starts the connection process and returns true.
// SignalConnected will be raised when the connection is successful;
// otherwise, SignalClosed will be raised with a net error set.
- virtual bool Connect(const talk_base::SocketAddress& address);
+ virtual bool Connect(const talk_base::SocketAddress& address) OVERRIDE;
// Tries to read at most |len| bytes into |data|.
//
@@ -80,7 +81,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
// case because StartTls() is called during a slot connected to
// SignalRead after parsing the final non-TLS reply from the server
// [see XmppClient::Private::OnSocketRead()].)
- virtual bool Read(char* data, size_t len, size_t* len_read);
+ virtual bool Read(char* data, size_t len, size_t* len_read) OVERRIDE;
// Queues up |len| bytes of |data| for writing.
//
@@ -99,11 +100,11 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
// Note that there's no guarantee that the data will actually be
// sent; however, it is guaranteed that the any data sent will be
// sent in FIFO order.
- virtual bool Write(const char* data, size_t len);
+ virtual bool Write(const char* data, size_t len) OVERRIDE;
// If the socket is not already closed, closes the socket and raises
// SignalClosed. Always returns true.
- virtual bool Close();
+ virtual bool Close() OVERRIDE;
// Tries to change to a TLS connection with the given domain name.
//
@@ -116,7 +117,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
// SignalSSLConnected will be raised when the connection is
// successful; otherwise, SignalClosed will be raised with a net
// error set.
- virtual bool StartTls(const std::string& domain_name);
+ virtual bool StartTls(const std::string& domain_name) OVERRIDE;
// Signal behavior:
//
diff --git a/jingle/notifier/base/fake_ssl_client_socket.h b/jingle/notifier/base/fake_ssl_client_socket.h
index d358173..9a5af54 100644
--- a/jingle/notifier/base/fake_ssl_client_socket.h
+++ b/jingle/notifier/base/fake_ssl_client_socket.h
@@ -20,6 +20,7 @@
#include <cstddef>
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_piece.h"
@@ -46,24 +47,24 @@ class FakeSSLClientSocket : public net::StreamSocket {
// net::StreamSocket 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);
- 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;
+ net::OldCompletionCallback* callback) OVERRIDE;
+ virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
+ virtual bool SetSendBufferSize(int32 size) OVERRIDE;
+ 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;
private:
enum HandshakeState {
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
index 0d7987d..a2f98f7 100644
--- a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
+++ b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
@@ -8,6 +8,7 @@
#include <string>
#include <vector>
+#include "base/compiler_specific.h"
#include "talk/xmpp/prexmppauth.h"
namespace notifier {
@@ -29,27 +30,27 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
virtual void StartPreXmppAuth(const buzz::Jid& jid,
const talk_base::SocketAddress& server,
const talk_base::CryptString& pass,
- const std::string& auth_cookie);
+ const std::string& auth_cookie) OVERRIDE;
- virtual bool IsAuthDone() const;
+ virtual bool IsAuthDone() const OVERRIDE;
- virtual bool IsAuthorized() const;
+ virtual bool IsAuthorized() const OVERRIDE;
- virtual bool HadError() const;
+ virtual bool HadError() const OVERRIDE;
- virtual int GetError() const;
+ virtual int GetError() const OVERRIDE;
- virtual buzz::CaptchaChallenge GetCaptchaChallenge() const;
+ virtual buzz::CaptchaChallenge GetCaptchaChallenge() const OVERRIDE;
- virtual std::string GetAuthCookie() const;
+ virtual std::string GetAuthCookie() const OVERRIDE;
// buzz::SaslHandler implementation.
virtual std::string ChooseBestSaslMechanism(
- const std::vector<std::string>& mechanisms, bool encrypted);
+ const std::vector<std::string>& mechanisms, bool encrypted) OVERRIDE;
virtual buzz::SaslMechanism* CreateSaslMechanism(
- const std::string& mechanism);
+ const std::string& mechanism) OVERRIDE;
static const char kDefaultAuthMechanism[];
diff --git a/jingle/notifier/base/proxy_resolving_client_socket.h b/jingle/notifier/base/proxy_resolving_client_socket.h
index 5ed2216..0c40a22 100644
--- a/jingle/notifier/base/proxy_resolving_client_socket.h
+++ b/jingle/notifier/base/proxy_resolving_client_socket.h
@@ -10,6 +10,7 @@
#pragma once
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "net/base/completion_callback.h"
diff --git a/jingle/notifier/base/task_pump.h b/jingle/notifier/base/task_pump.h
index 440dba4..b0a1a4d 100644
--- a/jingle/notifier/base/task_pump.h
+++ b/jingle/notifier/base/task_pump.h
@@ -5,6 +5,7 @@
#ifndef JINGLE_NOTIFIER_BASE_TASK_PUMP_H_
#define JINGLE_NOTIFIER_BASE_TASK_PUMP_H_
+#include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
#include "base/task.h"
#include "base/threading/non_thread_safe.h"
@@ -19,8 +20,8 @@ class TaskPump : public talk_base::TaskRunner {
virtual ~TaskPump();
// talk_base::TaskRunner implementation.
- virtual void WakeTasks();
- virtual int64 CurrentTime();
+ virtual void WakeTasks() OVERRIDE;
+ virtual int64 CurrentTime() OVERRIDE;
// No tasks will be processed after this is called, even if
// WakeTasks() is called.
diff --git a/jingle/notifier/base/weak_xmpp_client.h b/jingle/notifier/base/weak_xmpp_client.h
index e74cb2a..491d3d7 100644
--- a/jingle/notifier/base/weak_xmpp_client.h
+++ b/jingle/notifier/base/weak_xmpp_client.h
@@ -11,6 +11,7 @@
#pragma once
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "talk/xmpp/xmppclient.h"
@@ -40,7 +41,7 @@ class WeakXmppClient : public buzz::XmppClient {
void Invalidate();
protected:
- virtual void Stop();
+ virtual void Stop() OVERRIDE;
private:
base::NonThreadSafe non_thread_safe_;
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h
index 7904639..1d22e44 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.h
+++ b/jingle/notifier/base/xmpp_client_socket_factory.h
@@ -7,6 +7,7 @@
#include <string>
+#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "jingle/notifier/base/resolving_client_socket_factory.h"
#include "net/base/ssl_config_service.h"
@@ -35,11 +36,11 @@ class XmppClientSocketFactory : public ResolvingClientSocketFactory {
// ResolvingClientSocketFactory implementation.
virtual net::StreamSocket* CreateTransportClientSocket(
- const net::HostPortPair& host_and_port);
+ const net::HostPortPair& host_and_port) OVERRIDE;
virtual net::SSLClientSocket* CreateSSLClientSocket(
net::ClientSocketHandle* transport_socket,
- const net::HostPortPair& host_and_port);
+ const net::HostPortPair& host_and_port) OVERRIDE;
private:
net::ClientSocketFactory* const client_socket_factory_;
generated by cgit v1.1 at 2025-02-12 20:07:45 +0000