Add OVERRIDE to jingle/.

BUG=104314
TEST=no change

Review URL: http://codereview.chromium.org/8589003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110546 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 107 insertions, 86 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_;
diff --git a/jingle/notifier/communicator/login.h b/jingle/notifier/communicator/login.h
index ddc506e..d3bbfd4 100644
--- a/jingle/notifier/communicator/login.h
+++ b/jingle/notifier/communicator/login.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -69,14 +70,14 @@ class Login : public net::NetworkChangeNotifier::IPAddressObserver,
   void UpdateXmppSettings(const buzz::XmppClientSettings& user_settings);
 
   // net::NetworkChangeNotifier::IPAddressObserver implementation.
-  virtual void OnIPAddressChanged();
+  virtual void OnIPAddressChanged() OVERRIDE;
 
   // SingleLoginAttempt::Delegate implementation.
   virtual void OnConnect(
-      base::WeakPtr<buzz::XmppTaskParentInterface> base_task);
-  virtual void OnNeedReconnect();
+      base::WeakPtr<buzz::XmppTaskParentInterface> base_task) OVERRIDE;
+  virtual void OnNeedReconnect() OVERRIDE;
   virtual void OnRedirect(const std::string& redirect_server,
-                          int redirect_port);
+                          int redirect_port) OVERRIDE;
 
  private:
   void OnLogoff();
diff --git a/jingle/notifier/communicator/single_login_attempt.h b/jingle/notifier/communicator/single_login_attempt.h
index 8960767..2bdab1f 100644
--- a/jingle/notifier/communicator/single_login_attempt.h
+++ b/jingle/notifier/communicator/single_login_attempt.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "jingle/notifier/base/xmpp_connection.h"
 #include "jingle/notifier/communicator/xmpp_connection_generator.h"
@@ -46,15 +47,16 @@ class SingleLoginAttempt : public XmppConnection::Delegate,
   virtual ~SingleLoginAttempt();
 
   // XmppConnection::Delegate implementation.
-  virtual void OnConnect(base::WeakPtr<buzz::XmppTaskParentInterface> parent);
+  virtual void OnConnect(
+      base::WeakPtr<buzz::XmppTaskParentInterface> parent) OVERRIDE;
   virtual void OnError(buzz::XmppEngine::Error error,
                        int error_subcode,
-                       const buzz::XmlElement* stream_error);
+                       const buzz::XmlElement* stream_error) OVERRIDE;
 
   // XmppConnectionGenerator::Delegate implementation.
-  virtual void OnNewSettings(const ConnectionSettings& new_settings);
+  virtual void OnNewSettings(const ConnectionSettings& new_settings) OVERRIDE;
   virtual void OnExhaustedSettings(bool successfully_resolved_dns,
-                                   int first_dns_error);
+                                   int first_dns_error) OVERRIDE;
 
  private:
   LoginSettings* login_settings_;
diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h
index 4afac17..454d6b5 100644
--- a/jingle/notifier/listener/mediator_thread_impl.h
+++ b/jingle/notifier/listener/mediator_thread_impl.h
@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task.h"
@@ -50,20 +51,22 @@ class MediatorThreadImpl : public MediatorThread {
   explicit MediatorThreadImpl(const NotifierOptions& notifier_options);
   virtual ~MediatorThreadImpl();
 
-  virtual void AddObserver(Observer* observer);
-  virtual void RemoveObserver(Observer* observer);
+  virtual void AddObserver(Observer* observer) OVERRIDE;
+  virtual void RemoveObserver(Observer* observer) OVERRIDE;
 
   // Start the thread.
-  virtual void Start();
+  virtual void Start() OVERRIDE;
 
   // These are called from outside threads, by the talk mediator object.
   // They add messages to a queue which we poll in this thread.
-  virtual void Login(const buzz::XmppClientSettings& settings);
-  virtual void Logout();
-  virtual void ListenForUpdates();
-  virtual void SubscribeForUpdates(const SubscriptionList& subscriptions);
-  virtual void SendNotification(const Notification& data);
-  virtual void UpdateXmppSettings(const buzz::XmppClientSettings& settings);
+  virtual void Login(const buzz::XmppClientSettings& settings) OVERRIDE;
+  virtual void Logout() OVERRIDE;
+  virtual void ListenForUpdates() OVERRIDE;
+  virtual void SubscribeForUpdates(
+      const SubscriptionList& subscriptions) OVERRIDE;
+  virtual void SendNotification(const Notification& data) OVERRIDE;
+  virtual void UpdateXmppSettings(
+      const buzz::XmppClientSettings& settings) OVERRIDE;
 
   // Used by unit tests.  Make sure that tests that use this have the
   // IO message loop proxy passed in via |notifier_options| pointing
diff --git a/jingle/notifier/listener/mediator_thread_mock.h b/jingle/notifier/listener/mediator_thread_mock.h
index 12718a7..44b2043 100644
--- a/jingle/notifier/listener/mediator_thread_mock.h
+++ b/jingle/notifier/listener/mediator_thread_mock.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.
 
@@ -12,6 +12,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "jingle/notifier/listener/mediator_thread.h"
 
 namespace buzz {
@@ -28,23 +29,25 @@ class MockMediatorThread : public MediatorThread {
 
   void Reset();
 
-  virtual void AddObserver(Observer* observer);
+  virtual void AddObserver(Observer* observer) OVERRIDE;
 
-  virtual void RemoveObserver(Observer* observer);
+  virtual void RemoveObserver(Observer* observer) OVERRIDE;
 
   // Overridden from MediatorThread
-  virtual void Login(const buzz::XmppClientSettings& settings);
+  virtual void Login(const buzz::XmppClientSettings& settings) OVERRIDE;
 
-  virtual void Logout();
+  virtual void Logout() OVERRIDE;
 
-  virtual void Start();
+  virtual void Start() OVERRIDE;
 
-  virtual void SubscribeForUpdates(const SubscriptionList& subscriptions);
+  virtual void SubscribeForUpdates(
+      const SubscriptionList& subscriptions) OVERRIDE;
 
-  virtual void ListenForUpdates();
+  virtual void ListenForUpdates() OVERRIDE;
 
-  virtual void SendNotification(const Notification &);
-  virtual void UpdateXmppSettings(const buzz::XmppClientSettings& settings);
+  virtual void SendNotification(const Notification &) OVERRIDE;
+  virtual void UpdateXmppSettings(
+      const buzz::XmppClientSettings& settings) OVERRIDE;
 
 
   void ReceiveNotification(const Notification& data);
diff --git a/jingle/notifier/listener/push_notifications_listen_task.h b/jingle/notifier/listener/push_notifications_listen_task.h
index fa6f3ae..7d41a8b 100644
--- a/jingle/notifier/listener/push_notifications_listen_task.h
+++ b/jingle/notifier/listener/push_notifications_listen_task.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 //
@@ -13,6 +13,7 @@
 #ifndef JINGLE_NOTIFIER_PUSH_NOTIFICATIONS_LISTENER_LISTEN_TASK_H_
 #define JINGLE_NOTIFIER_PUSH_NOTIFICATIONS_LISTENER_LISTEN_TASK_H_
 
+#include "base/compiler_specific.h"
 #include "talk/xmpp/xmpptask.h"
 
 namespace buzz {
@@ -37,9 +38,9 @@ class PushNotificationsListenTask : public buzz::XmppTask {
   virtual ~PushNotificationsListenTask();
 
   // Overriden from buzz::XmppTask.
-  virtual int ProcessStart();
-  virtual int ProcessResponse();
-  virtual bool HandleStanza(const buzz::XmlElement* stanza);
+  virtual int ProcessStart() OVERRIDE;
+  virtual int ProcessResponse() OVERRIDE;
+  virtual bool HandleStanza(const buzz::XmlElement* stanza) OVERRIDE;
 
  private:
   bool IsValidNotification(const buzz::XmlElement* stanza);
diff --git a/jingle/notifier/listener/push_notifications_send_update_task.h b/jingle/notifier/listener/push_notifications_send_update_task.h
index 7e1a938..36bb3c3 100644
--- a/jingle/notifier/listener/push_notifications_send_update_task.h
+++ b/jingle/notifier/listener/push_notifications_send_update_task.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.
 //
@@ -8,6 +8,7 @@
 #define JINGLE_NOTIFIER_LISTENER_PUSH_NOTIFICATIONS_SEND_UPDATE_TASK_H_
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "jingle/notifier/listener/notification_defines.h"
 #include "talk/xmpp/xmpptask.h"
@@ -26,7 +27,7 @@ class PushNotificationsSendUpdateTask : public buzz::XmppTask {
   virtual ~PushNotificationsSendUpdateTask();
 
   // Overridden from buzz::XmppTask.
-  virtual int ProcessStart();
+  virtual int ProcessStart() OVERRIDE;
 
  private:
   // Allocates and constructs an buzz::XmlElement containing the update stanza.
diff --git a/jingle/notifier/listener/push_notifications_subscribe_task.h b/jingle/notifier/listener/push_notifications_subscribe_task.h
index edd65d8..4c34740 100644
--- a/jingle/notifier/listener/push_notifications_subscribe_task.h
+++ b/jingle/notifier/listener/push_notifications_subscribe_task.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 //
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "jingle/notifier/listener/notification_defines.h"
 #include "talk/xmllite/xmlelement.h"
@@ -31,9 +32,9 @@ class PushNotificationsSubscribeTask : public buzz::XmppTask {
   virtual ~PushNotificationsSubscribeTask();
 
   // Overridden from XmppTask.
-  virtual int ProcessStart();
-  virtual int ProcessResponse();
-  virtual bool HandleStanza(const buzz::XmlElement* stanza);
+  virtual int ProcessStart() OVERRIDE;
+  virtual int ProcessResponse() OVERRIDE;
+  virtual bool HandleStanza(const buzz::XmlElement* stanza) OVERRIDE;
 
  private:
   // Assembles an Xmpp stanza which can be sent to subscribe to notifications.
diff --git a/jingle/notifier/listener/talk_mediator_impl.h b/jingle/notifier/listener/talk_mediator_impl.h
index 93f122a..d49e054 100644
--- a/jingle/notifier/listener/talk_mediator_impl.h
+++ b/jingle/notifier/listener/talk_mediator_impl.h
@@ -12,6 +12,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
@@ -39,7 +40,7 @@ class TalkMediatorImpl
   // TalkMediator implementation.
 
   // Should be called on the same thread as the constructor.
-  virtual void SetDelegate(TalkMediator::Delegate* delegate);
+  virtual void SetDelegate(TalkMediator::Delegate* delegate) OVERRIDE;
 
   // All the methods below should be called on the same thread. It may or may
   // not be same as the thread on which the object was constructed.
@@ -47,24 +48,25 @@ class TalkMediatorImpl
   // |email| must be a valid email address (e.g., foo@bar.com).
   virtual void SetAuthToken(const std::string& email,
                             const std::string& token,
-                            const std::string& token_service);
-  virtual bool Login();
+                            const std::string& token_service) OVERRIDE;
+  virtual bool Login() OVERRIDE;
   // Users must call Logout once Login is called.
-  virtual bool Logout();
+  virtual bool Logout() OVERRIDE;
 
-  virtual void SendNotification(const Notification& data);
+  virtual void SendNotification(const Notification& data) OVERRIDE;
 
-  virtual void AddSubscription(const Subscription& subscription);
+  virtual void AddSubscription(const Subscription& subscription) OVERRIDE;
 
   // MediatorThread::Delegate implementation.
 
-  virtual void OnConnectionStateChange(bool logged_in);
+  virtual void OnConnectionStateChange(bool logged_in) OVERRIDE;
 
-  virtual void OnSubscriptionStateChange(bool subscribed);
+  virtual void OnSubscriptionStateChange(bool subscribed) OVERRIDE;
 
-  virtual void OnIncomingNotification(const Notification& notification);
+  virtual void OnIncomingNotification(
+      const Notification& notification) OVERRIDE;
 
-  virtual void OnOutgoingNotification();
+  virtual void OnOutgoingNotification() OVERRIDE;
 
  private:
   struct TalkMediatorState {