diff options
22 files changed, 110 insertions, 98 deletions
diff --git a/remoting/base/compound_buffer.h b/remoting/base/compound_buffer.h index b07f40f..227f5fa 100644 --- a/remoting/base/compound_buffer.h +++ b/remoting/base/compound_buffer.h @@ -108,10 +108,10 @@ class CompoundBufferInputStream int position() const { return position_; } // google::protobuf::io::ZeroCopyInputStream interface. - virtual bool Next(const void** data, int* size); - virtual void BackUp(int count); - virtual bool Skip(int count); - virtual int64 ByteCount() const; + virtual bool Next(const void** data, int* size) OVERRIDE; + virtual void BackUp(int count) OVERRIDE; + virtual bool Skip(int count) OVERRIDE; + virtual int64 ByteCount() const OVERRIDE; private: const CompoundBuffer* buffer_; diff --git a/remoting/base/compressor_verbatim.h b/remoting/base/compressor_verbatim.h index f7e7224..93cbd3c 100644 --- a/remoting/base/compressor_verbatim.h +++ b/remoting/base/compressor_verbatim.h @@ -1,10 +1,11 @@ -// 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. #ifndef REMOTING_BASE_COMPRESSOR_VERBATIM_H_ #define REMOTING_BASE_COMPRESSOR_VERBATIM_H_ +#include "base/compiler_specific.h" #include "remoting/base/compressor.h" namespace remoting { @@ -16,11 +17,15 @@ class CompressorVerbatim : public Compressor { virtual ~CompressorVerbatim(); // Compressor implementations. - virtual bool Process(const uint8* input_data, int input_size, - uint8* output_data, int output_size, - CompressorFlush flush, int* consumed, int* written); - - virtual void Reset(); + virtual bool Process(const uint8* input_data, + int input_size, + uint8* output_data, + int output_size, + CompressorFlush flush, + int* consumed, + int* written) OVERRIDE; + + virtual void Reset() OVERRIDE; }; } // namespace remoting diff --git a/remoting/base/compressor_zlib.h b/remoting/base/compressor_zlib.h index ba959cf..32ac6c4 100644 --- a/remoting/base/compressor_zlib.h +++ b/remoting/base/compressor_zlib.h @@ -19,11 +19,15 @@ class CompressorZlib : public Compressor { virtual ~CompressorZlib(); // Compressor implementations. - virtual bool Process(const uint8* input_data, int input_size, - uint8* output_data, int output_size, - CompressorFlush flush, int* consumed, int* written); - - virtual void Reset(); + virtual bool Process(const uint8* input_data, + int input_size, + uint8* output_data, + int output_size, + CompressorFlush flush, + int* consumed, + int* written) OVERRIDE; + + virtual void Reset() OVERRIDE; private: scoped_ptr<z_stream> stream_; diff --git a/remoting/base/decoder_row_based.h b/remoting/base/decoder_row_based.h index e47ed89..7086c7b 100644 --- a/remoting/base/decoder_row_based.h +++ b/remoting/base/decoder_row_based.h @@ -19,12 +19,12 @@ class DecoderRowBased : public Decoder { static DecoderRowBased* CreateVerbatimDecoder(); // Decoder implementation. - virtual bool IsReadyForData(); - virtual void Initialize(scoped_refptr<media::VideoFrame> frame); - virtual DecodeResult DecodePacket(const VideoPacket* packet); - virtual void GetUpdatedRects(RectVector* rects); - virtual void Reset(); - virtual VideoPacketFormat::Encoding Encoding(); + virtual bool IsReadyForData() OVERRIDE; + virtual void Initialize(scoped_refptr<media::VideoFrame> frame) OVERRIDE; + virtual DecodeResult DecodePacket(const VideoPacket* packet) OVERRIDE; + virtual void GetUpdatedRects(RectVector* rects) OVERRIDE; + virtual void Reset() OVERRIDE; + virtual VideoPacketFormat::Encoding Encoding() OVERRIDE; private: enum State { diff --git a/remoting/base/decompressor_verbatim.h b/remoting/base/decompressor_verbatim.h index ca712bf..cad9022 100644 --- a/remoting/base/decompressor_verbatim.h +++ b/remoting/base/decompressor_verbatim.h @@ -16,12 +16,12 @@ class DecompressorVerbatim : public Decompressor { DecompressorVerbatim(); virtual ~DecompressorVerbatim(); - virtual void Reset(); + virtual void Reset() OVERRIDE; // Decompressor implementations. virtual bool Process(const uint8* input_data, int input_size, uint8* output_data, int output_size, - int* consumed, int* written); + int* consumed, int* written) OVERRIDE; }; } // namespace remoting diff --git a/remoting/base/decompressor_zlib.h b/remoting/base/decompressor_zlib.h index 007672b..5d1a88b 100644 --- a/remoting/base/decompressor_zlib.h +++ b/remoting/base/decompressor_zlib.h @@ -18,12 +18,12 @@ class DecompressorZlib : public Decompressor { DecompressorZlib(); virtual ~DecompressorZlib(); - virtual void Reset(); + virtual void Reset() OVERRIDE; // Decompressor implementations. virtual bool Process(const uint8* input_data, int input_size, uint8* output_data, int output_size, - int* consumed, int* written); + int* consumed, int* written) OVERRIDE; private: void InitStream(); diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h index 235b3e6..1ca45fd 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.h +++ b/remoting/client/plugin/chromoting_scriptable_object.h @@ -145,17 +145,17 @@ class ChromotingScriptableObject virtual void Init(); // Override the ScriptableObject functions. - virtual bool HasProperty(const pp::Var& name, pp::Var* exception); - virtual bool HasMethod(const pp::Var& name, pp::Var* exception); - virtual pp::Var GetProperty(const pp::Var& name, pp::Var* exception); + virtual bool HasProperty(const pp::Var& name, pp::Var* exception) OVERRIDE; + virtual bool HasMethod(const pp::Var& name, pp::Var* exception) OVERRIDE; + virtual pp::Var GetProperty(const pp::Var& name, pp::Var* exception) OVERRIDE; virtual void GetAllPropertyNames(std::vector<pp::Var>* properties, - pp::Var* exception); + pp::Var* exception) OVERRIDE; virtual void SetProperty(const pp::Var& name, const pp::Var& value, - pp::Var* exception); + pp::Var* exception) OVERRIDE; virtual pp::Var Call(const pp::Var& method_name, const std::vector<pp::Var>& args, - pp::Var* exception); + pp::Var* exception) OVERRIDE; void SetConnectionStatus(ConnectionStatus status, ConnectionError error); void LogDebugInfo(const std::string& info); diff --git a/remoting/client/plugin/pepper_input_handler.h b/remoting/client/plugin/pepper_input_handler.h index 22ec759..bc7f2be 100644 --- a/remoting/client/plugin/pepper_input_handler.h +++ b/remoting/client/plugin/pepper_input_handler.h @@ -24,7 +24,7 @@ class PepperInputHandler : public InputHandler { PepperViewProxy* view); virtual ~PepperInputHandler(); - virtual void Initialize(); + virtual void Initialize() OVERRIDE; void HandleKeyEvent(bool keydown, const pp::KeyboardInputEvent& event); void HandleCharacterEvent(const pp::KeyboardInputEvent& event); diff --git a/remoting/client/plugin/pepper_xmpp_proxy.h b/remoting/client/plugin/pepper_xmpp_proxy.h index 189572c..cc3e690 100644 --- a/remoting/client/plugin/pepper_xmpp_proxy.h +++ b/remoting/client/plugin/pepper_xmpp_proxy.h @@ -33,10 +33,11 @@ class PepperXmppProxy : public XmppProxy { // create a WeakPtr on, say the pepper thread, and then pass execution of // this function callback with the weak pointer bound as a parameter. That // will fail because the WeakPtr will have been created on the wrong thread. - virtual void AttachCallback(base::WeakPtr<ResponseCallback> callback); - virtual void DetachCallback(); + virtual void AttachCallback( + base::WeakPtr<ResponseCallback> callback) OVERRIDE; + virtual void DetachCallback() OVERRIDE; - virtual void SendIq(const std::string& request_xml); + virtual void SendIq(const std::string& request_xml) OVERRIDE; virtual void OnIq(const std::string& response_xml); private: diff --git a/remoting/host/capturer_fake_ascii.h b/remoting/host/capturer_fake_ascii.h index 07261e3..5559197 100644 --- a/remoting/host/capturer_fake_ascii.h +++ b/remoting/host/capturer_fake_ascii.h @@ -30,7 +30,7 @@ class CapturerFakeAscii : public Capturer { virtual void InvalidateFullScreen() OVERRIDE; virtual void CaptureInvalidRegion( const CaptureCompletedCallback& callback) OVERRIDE; - virtual const SkISize& size_most_recent() const; + virtual const SkISize& size_most_recent() const OVERRIDE; private: // Generates an image in the front buffer. diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h index 2ed080f..a301ff9 100644 --- a/remoting/host/client_session.h +++ b/remoting/host/client_session.h @@ -46,8 +46,8 @@ class ClientSession : public protocol::HostStub, virtual ~ClientSession(); // protocol::InputStub interface. - virtual void InjectKeyEvent(const protocol::KeyEvent& event); - virtual void InjectMouseEvent(const protocol::MouseEvent& event); + virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE; + virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE; // protocol::ConnectionToClient::EventHandler interface. virtual void OnConnectionOpened( diff --git a/remoting/host/in_memory_host_config.h b/remoting/host/in_memory_host_config.h index e96fdb4..4043e83 100644 --- a/remoting/host/in_memory_host_config.h +++ b/remoting/host/in_memory_host_config.h @@ -25,13 +25,15 @@ class InMemoryHostConfig : public MutableHostConfig { virtual ~InMemoryHostConfig(); // MutableHostConfig interface. - virtual bool GetString(const std::string& path, std::string* out_value); - virtual bool GetBoolean(const std::string& path, bool* out_value); + virtual bool GetString(const std::string& path, + std::string* out_value) OVERRIDE; + virtual bool GetBoolean(const std::string& path, bool* out_value) OVERRIDE; - virtual void SetString(const std::string& path, const std::string& in_value); - virtual void SetBoolean(const std::string& path, bool in_value); + virtual void SetString(const std::string& path, + const std::string& in_value) OVERRIDE; + virtual void SetBoolean(const std::string& path, bool in_value) OVERRIDE; - virtual void Save(); + virtual void Save() OVERRIDE; protected: // |lock_| must be locked whenever |values_| is used. diff --git a/remoting/host/json_host_config.h b/remoting/host/json_host_config.h index e55975e..e04238c 100644 --- a/remoting/host/json_host_config.h +++ b/remoting/host/json_host_config.h @@ -28,7 +28,7 @@ class JsonHostConfig : public InMemoryHostConfig { virtual bool Read(); // MutableHostConfig interface. - virtual void Save(); + virtual void Save() OVERRIDE; private: void DoWrite(); 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 diff --git a/remoting/protocol/buffered_socket_writer.h b/remoting/protocol/buffered_socket_writer.h index 5aa083f..762e045 100644 --- a/remoting/protocol/buffered_socket_writer.h +++ b/remoting/protocol/buffered_socket_writer.h @@ -110,9 +110,9 @@ class BufferedSocketWriter : public BufferedSocketWriterBase { virtual ~BufferedSocketWriter(); protected: - virtual void GetNextPacket_Locked(net::IOBuffer** buffer, int* size); - virtual void AdvanceBufferPosition_Locked(int written); - virtual void OnError_Locked(int result); + virtual void GetNextPacket_Locked(net::IOBuffer** buffer, int* size) OVERRIDE; + virtual void AdvanceBufferPosition_Locked(int written) OVERRIDE; + virtual void OnError_Locked(int result) OVERRIDE; private: scoped_refptr<net::DrainableIOBuffer> current_buf_; @@ -124,9 +124,9 @@ class BufferedDatagramWriter : public BufferedSocketWriterBase { virtual ~BufferedDatagramWriter(); protected: - virtual void GetNextPacket_Locked(net::IOBuffer** buffer, int* size); - virtual void AdvanceBufferPosition_Locked(int written); - virtual void OnError_Locked(int result); + virtual void GetNextPacket_Locked(net::IOBuffer** buffer, int* size) OVERRIDE; + virtual void AdvanceBufferPosition_Locked(int written) OVERRIDE; + virtual void OnError_Locked(int result) OVERRIDE; }; } // namespace protocol diff --git a/remoting/protocol/channel_authenticator.h b/remoting/protocol/channel_authenticator.h index a95fd3d..c925ea9 100644 --- a/remoting/protocol/channel_authenticator.h +++ b/remoting/protocol/channel_authenticator.h @@ -78,7 +78,7 @@ class ClientChannelAuthenticator : public ChannelAuthenticator { // ChannelAuthenticator overrides. virtual void Authenticate(net::SSLSocket* socket, - const DoneCallback& done_callback); + const DoneCallback& done_callback) OVERRIDE; private: void DoAuthWrite(); diff --git a/remoting/protocol/client_event_dispatcher.h b/remoting/protocol/client_event_dispatcher.h index ce3759d..32a570b 100644 --- a/remoting/protocol/client_event_dispatcher.h +++ b/remoting/protocol/client_event_dispatcher.h @@ -31,8 +31,8 @@ class ClientEventDispatcher : public InputStub { void Init(Session* session); // InputStub implementation. - virtual void InjectKeyEvent(const KeyEvent& event); - virtual void InjectMouseEvent(const MouseEvent& event); + virtual void InjectKeyEvent(const KeyEvent& event) OVERRIDE; + virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE; private: scoped_refptr<BufferedSocketWriter> writer_; diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h index c7be7e4..a52e88c 100644 --- a/remoting/protocol/fake_session.h +++ b/remoting/protocol/fake_session.h @@ -39,12 +39,12 @@ class FakeSocket : public net::StreamSocket { // net::Socket interface. 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); + net::OldCompletionCallback* callback) OVERRIDE; - virtual bool SetReceiveBufferSize(int32 size); - virtual bool SetSendBufferSize(int32 size); + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; + virtual bool SetSendBufferSize(int32 size) OVERRIDE; // net::StreamSocket interface. virtual int Connect(net::OldCompletionCallback* callback) OVERRIDE; @@ -95,12 +95,12 @@ class FakeUdpSocket : public net::Socket { // net::Socket interface. 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); + net::OldCompletionCallback* callback) OVERRIDE; - virtual bool SetReceiveBufferSize(int32 size); - virtual bool SetSendBufferSize(int32 size); + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; + virtual bool SetSendBufferSize(int32 size) OVERRIDE; private: bool read_pending_; diff --git a/remoting/protocol/rtp_reader.h b/remoting/protocol/rtp_reader.h index 175c108..dfd87de 100644 --- a/remoting/protocol/rtp_reader.h +++ b/remoting/protocol/rtp_reader.h @@ -66,7 +66,7 @@ class RtpReader : public SocketReaderBase { protected: friend class RtpVideoReaderTest; - virtual void OnDataReceived(net::IOBuffer* buffer, int data_size); + virtual void OnDataReceived(net::IOBuffer* buffer, int data_size) OVERRIDE; private: OnMessageCallback on_message_callback_; |