diff options
Diffstat (limited to 'remoting/client')
25 files changed, 159 insertions, 171 deletions
diff --git a/remoting/client/audio_decode_scheduler.h b/remoting/client/audio_decode_scheduler.h index 51d5d58..7848d67 100644 --- a/remoting/client/audio_decode_scheduler.h +++ b/remoting/client/audio_decode_scheduler.h @@ -29,14 +29,14 @@ class AudioDecodeScheduler : public protocol::AudioStub { scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, scoped_refptr<base::SingleThreadTaskRunner> audio_decode_task_runner, scoped_ptr<AudioPlayer> audio_player); - virtual ~AudioDecodeScheduler(); + ~AudioDecodeScheduler() override; // Initializes decoder with the information from the protocol config. void Initialize(const protocol::SessionConfig& config); // AudioStub implementation. - virtual void ProcessAudioPacket(scoped_ptr<AudioPacket> packet, - const base::Closure& done) override; + void ProcessAudioPacket(scoped_ptr<AudioPacket> packet, + const base::Closure& done) override; private: class Core; diff --git a/remoting/client/audio_player_unittest.cc b/remoting/client/audio_player_unittest.cc index ed478d6f..733bf24 100644 --- a/remoting/client/audio_player_unittest.cc +++ b/remoting/client/audio_player_unittest.cc @@ -29,13 +29,9 @@ class FakeAudioPlayer : public AudioPlayer { FakeAudioPlayer() { } - virtual bool ResetAudioPlayer(AudioPacket::SamplingRate) override { - return true; - } + bool ResetAudioPlayer(AudioPacket::SamplingRate) override { return true; } - virtual uint32 GetSamplesPerFrame() override { - return kAudioSamplesPerFrame; - } + uint32 GetSamplesPerFrame() override { return kAudioSamplesPerFrame; } }; class AudioPlayerTest : public ::testing::Test { diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h index a0088f5..9695084 100644 --- a/remoting/client/chromoting_client.h +++ b/remoting/client/chromoting_client.h @@ -47,7 +47,7 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback, VideoRenderer* video_renderer, scoped_ptr<AudioPlayer> audio_player); - virtual ~ChromotingClient(); + ~ChromotingClient() override; void SetProtocolConfigForTests( scoped_ptr<protocol::CandidateSessionConfig> config); @@ -71,28 +71,23 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback, protocol::InputStub* input_stub() { return connection_.input_stub(); } // ClientStub implementation. - virtual void SetCapabilities( - const protocol::Capabilities& capabilities) override; - virtual void SetPairingResponse( + void SetCapabilities(const protocol::Capabilities& capabilities) override; + void SetPairingResponse( const protocol::PairingResponse& pairing_response) override; - virtual void DeliverHostMessage( - const protocol::ExtensionMessage& message) override; + void DeliverHostMessage(const protocol::ExtensionMessage& message) override; // ClipboardStub implementation for receiving clipboard data from host. - virtual void InjectClipboardEvent( - const protocol::ClipboardEvent& event) override; + void InjectClipboardEvent(const protocol::ClipboardEvent& event) override; // CursorShapeStub implementation for receiving cursor shape updates. - virtual void SetCursorShape( - const protocol::CursorShapeInfo& cursor_shape) override; + void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override; // ConnectionToHost::HostEventCallback implementation. - virtual void OnConnectionState( - protocol::ConnectionToHost::State state, - protocol::ErrorCode error) override; - virtual void OnConnectionReady(bool ready) override; - virtual void OnRouteChanged(const std::string& channel_name, - const protocol::TransportRoute& route) override; + void OnConnectionState(protocol::ConnectionToHost::State state, + protocol::ErrorCode error) override; + void OnConnectionReady(bool ready) override; + void OnRouteChanged(const std::string& channel_name, + const protocol::TransportRoute& route) override; private: // Called when the connection is authenticated. diff --git a/remoting/client/frame_consumer_proxy.h b/remoting/client/frame_consumer_proxy.h index 3b273bb..15b1012 100644 --- a/remoting/client/frame_consumer_proxy.h +++ b/remoting/client/frame_consumer_proxy.h @@ -30,19 +30,19 @@ class FrameConsumerProxy const base::WeakPtr<FrameConsumer>& frame_consumer); // FrameConsumer implementation. - virtual void ApplyBuffer(const webrtc::DesktopSize& view_size, - const webrtc::DesktopRect& clip_area, - webrtc::DesktopFrame* buffer, - const webrtc::DesktopRegion& region, - const webrtc::DesktopRegion& shape) override; - virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) override; - virtual void SetSourceSize(const webrtc::DesktopSize& source_size, - const webrtc::DesktopVector& dpi) override; - virtual PixelFormat GetPixelFormat() override; + void ApplyBuffer(const webrtc::DesktopSize& view_size, + const webrtc::DesktopRect& clip_area, + webrtc::DesktopFrame* buffer, + const webrtc::DesktopRegion& region, + const webrtc::DesktopRegion& shape) override; + void ReturnBuffer(webrtc::DesktopFrame* buffer) override; + void SetSourceSize(const webrtc::DesktopSize& source_size, + const webrtc::DesktopVector& dpi) override; + PixelFormat GetPixelFormat() override; private: friend class base::RefCountedThreadSafe<FrameConsumerProxy>; - virtual ~FrameConsumerProxy(); + ~FrameConsumerProxy() override; base::WeakPtr<FrameConsumer> frame_consumer_; scoped_refptr<base::SingleThreadTaskRunner> task_runner_; diff --git a/remoting/client/key_event_mapper.h b/remoting/client/key_event_mapper.h index 51f3afc..b81c657 100644 --- a/remoting/client/key_event_mapper.h +++ b/remoting/client/key_event_mapper.h @@ -22,7 +22,7 @@ class KeyEventMapper : public protocol::InputFilter { public: KeyEventMapper(); explicit KeyEventMapper(InputStub* input_stub); - virtual ~KeyEventMapper(); + ~KeyEventMapper() override; // Callback type for use with SetTrapCallback(), below. typedef base::Callback<void(const protocol::KeyEvent&)> KeyTrapCallback; @@ -39,7 +39,7 @@ class KeyEventMapper : public protocol::InputFilter { void RemapKey(uint32 in_usb_keycode, uint32 out_usb_keycode); // InputFilter overrides. - virtual void InjectKeyEvent(const protocol::KeyEvent& event) override; + void InjectKeyEvent(const protocol::KeyEvent& event) override; private: std::map<uint32,uint32> mapped_keys; diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index bd4e7c4..d630bf9 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -104,37 +104,33 @@ class ChromotingInstance : static const int kApiMinScriptableVersion = 5; explicit ChromotingInstance(PP_Instance instance); - virtual ~ChromotingInstance(); + ~ChromotingInstance() override; // pp::Instance interface. - virtual void DidChangeFocus(bool has_focus) override; - virtual void DidChangeView(const pp::View& view) override; - virtual bool Init(uint32_t argc, const char* argn[], - const char* argv[]) override; - virtual void HandleMessage(const pp::Var& message) override; - virtual bool HandleInputEvent(const pp::InputEvent& event) override; + void DidChangeFocus(bool has_focus) override; + void DidChangeView(const pp::View& view) override; + bool Init(uint32_t argc, const char* argn[], const char* argv[]) override; + void HandleMessage(const pp::Var& message) override; + bool HandleInputEvent(const pp::InputEvent& event) override; // ClientUserInterface interface. - virtual void OnConnectionState(protocol::ConnectionToHost::State state, - protocol::ErrorCode error) override; - virtual void OnConnectionReady(bool ready) override; - virtual void OnRouteChanged(const std::string& channel_name, - const protocol::TransportRoute& route) override; - virtual void SetCapabilities(const std::string& capabilities) override; - virtual void SetPairingResponse( + void OnConnectionState(protocol::ConnectionToHost::State state, + protocol::ErrorCode error) override; + void OnConnectionReady(bool ready) override; + void OnRouteChanged(const std::string& channel_name, + const protocol::TransportRoute& route) override; + void SetCapabilities(const std::string& capabilities) override; + void SetPairingResponse( const protocol::PairingResponse& pairing_response) override; - virtual void DeliverHostMessage( - const protocol::ExtensionMessage& message) override; - virtual protocol::ClipboardStub* GetClipboardStub() override; - virtual protocol::CursorShapeStub* GetCursorShapeStub() override; + void DeliverHostMessage(const protocol::ExtensionMessage& message) override; + protocol::ClipboardStub* GetClipboardStub() override; + protocol::CursorShapeStub* GetCursorShapeStub() override; // protocol::ClipboardStub interface. - virtual void InjectClipboardEvent( - const protocol::ClipboardEvent& event) override; + void InjectClipboardEvent(const protocol::ClipboardEvent& event) override; // protocol::CursorShapeStub interface. - virtual void SetCursorShape( - const protocol::CursorShapeInfo& cursor_shape) override; + void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override; // Called by PepperView. void SetDesktopSize(const webrtc::DesktopSize& size, @@ -244,12 +240,13 @@ class ChromotingInstance : const protocol::SecretFetchedCallback& secret_fetched_callback); // MediaSourceVideoRenderer::Delegate implementation. - virtual void OnMediaSourceSize(const webrtc::DesktopSize& size, - const webrtc::DesktopVector& dpi) override; - virtual void OnMediaSourceShape(const webrtc::DesktopRegion& shape) override; - virtual void OnMediaSourceReset(const std::string& format) override; - virtual void OnMediaSourceData(uint8_t* buffer, size_t buffer_size, - bool keyframe) override; + void OnMediaSourceSize(const webrtc::DesktopSize& size, + const webrtc::DesktopVector& dpi) override; + void OnMediaSourceShape(const webrtc::DesktopRegion& shape) override; + void OnMediaSourceReset(const std::string& format) override; + void OnMediaSourceData(uint8_t* buffer, + size_t buffer_size, + bool keyframe) override; bool initialized_; diff --git a/remoting/client/plugin/delegating_signal_strategy.h b/remoting/client/plugin/delegating_signal_strategy.h index e78a47c..12fb595 100644 --- a/remoting/client/plugin/delegating_signal_strategy.h +++ b/remoting/client/plugin/delegating_signal_strategy.h @@ -21,20 +21,20 @@ class DelegatingSignalStrategy : public SignalStrategy { DelegatingSignalStrategy(std::string local_jid, const SendIqCallback& send_iq_callback); - virtual ~DelegatingSignalStrategy(); + ~DelegatingSignalStrategy() override; void OnIncomingMessage(const std::string& message); // SignalStrategy interface. - virtual void Connect() override; - virtual void Disconnect() override; - virtual State GetState() const override; - virtual Error GetError() const override; - virtual std::string GetLocalJid() const override; - virtual void AddListener(Listener* listener) override; - virtual void RemoveListener(Listener* listener) override; - virtual bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override; - virtual std::string GetNextId() override; + void Connect() override; + void Disconnect() override; + State GetState() const override; + Error GetError() const override; + std::string GetLocalJid() const override; + void AddListener(Listener* listener) override; + void RemoveListener(Listener* listener) override; + bool SendStanza(scoped_ptr<buzz::XmlElement> stanza) override; + std::string GetNextId() override; private: std::string local_jid_; diff --git a/remoting/client/plugin/media_source_video_renderer.cc b/remoting/client/plugin/media_source_video_renderer.cc index e6d21b8..812d700 100644 --- a/remoting/client/plugin/media_source_video_renderer.cc +++ b/remoting/client/plugin/media_source_video_renderer.cc @@ -22,18 +22,18 @@ class MediaSourceVideoRenderer::VideoWriter : public mkvmuxer::IMkvWriter { typedef std::vector<uint8_t> DataBuffer; VideoWriter(const webrtc::DesktopSize& frame_size, const char* codec_id); - virtual ~VideoWriter(); + ~VideoWriter() override; const webrtc::DesktopSize& size() { return frame_size_; } int64_t last_frame_timestamp() { return timecode_ - kFrameIntervalNs; } // IMkvWriter interface. - virtual mkvmuxer::int32 Write(const void* buf, mkvmuxer::uint32 len) override; - virtual mkvmuxer::int64 Position() const override; - virtual mkvmuxer::int32 Position(mkvmuxer::int64 position) override; - virtual bool Seekable() const override; - virtual void ElementStartNotify(mkvmuxer::uint64 element_id, - mkvmuxer::int64 position) override; + mkvmuxer::int32 Write(const void* buf, mkvmuxer::uint32 len) override; + mkvmuxer::int64 Position() const override; + mkvmuxer::int32 Position(mkvmuxer::int64 position) override; + bool Seekable() const override; + void ElementStartNotify(mkvmuxer::uint64 element_id, + mkvmuxer::int64 position) override; scoped_ptr<DataBuffer> OnVideoFrame(const std::string& video_data, bool keyframe); diff --git a/remoting/client/plugin/media_source_video_renderer.h b/remoting/client/plugin/media_source_video_renderer.h index c8c260bb..9497072 100644 --- a/remoting/client/plugin/media_source_video_renderer.h +++ b/remoting/client/plugin/media_source_video_renderer.h @@ -43,13 +43,13 @@ class MediaSourceVideoRenderer : public VideoRenderer { }; explicit MediaSourceVideoRenderer(Delegate* delegate); - virtual ~MediaSourceVideoRenderer(); + ~MediaSourceVideoRenderer() override; // VideoRenderer interface. - virtual void Initialize(const protocol::SessionConfig& config) override; - virtual ChromotingStats* GetStats() override; - virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet, - const base::Closure& done) override; + void Initialize(const protocol::SessionConfig& config) override; + ChromotingStats* GetStats() override; + void ProcessVideoPacket(scoped_ptr<VideoPacket> packet, + const base::Closure& done) override; private: // Helper class used to generate WebM stream. diff --git a/remoting/client/plugin/normalizing_input_filter_cros.h b/remoting/client/plugin/normalizing_input_filter_cros.h index 73c919a..9158d89 100644 --- a/remoting/client/plugin/normalizing_input_filter_cros.h +++ b/remoting/client/plugin/normalizing_input_filter_cros.h @@ -23,11 +23,11 @@ namespace remoting { class NormalizingInputFilterCros : public protocol::InputFilter { public: explicit NormalizingInputFilterCros(protocol::InputStub* input_stub); - virtual ~NormalizingInputFilterCros(); + ~NormalizingInputFilterCros() override; // InputFilter overrides. - virtual void InjectKeyEvent(const protocol::KeyEvent& event) override; - virtual void InjectMouseEvent(const protocol::MouseEvent& event) override; + void InjectKeyEvent(const protocol::KeyEvent& event) override; + void InjectMouseEvent(const protocol::MouseEvent& event) override; private: void ProcessKeyDown(const protocol::KeyEvent& event); diff --git a/remoting/client/plugin/normalizing_input_filter_mac.h b/remoting/client/plugin/normalizing_input_filter_mac.h index 5e33911..a262cda 100644 --- a/remoting/client/plugin/normalizing_input_filter_mac.h +++ b/remoting/client/plugin/normalizing_input_filter_mac.h @@ -45,10 +45,10 @@ namespace remoting { class NormalizingInputFilterMac : public protocol::InputFilter { public: explicit NormalizingInputFilterMac(protocol::InputStub* input_stub); - virtual ~NormalizingInputFilterMac(); + ~NormalizingInputFilterMac() override; // InputFilter overrides. - virtual void InjectKeyEvent(const protocol::KeyEvent& event) override; + void InjectKeyEvent(const protocol::KeyEvent& event) override; private: typedef std::map<int, protocol::KeyEvent> KeyPressedMap; diff --git a/remoting/client/plugin/pepper_address_resolver.h b/remoting/client/plugin/pepper_address_resolver.h index 42e61b6..68e7b73 100644 --- a/remoting/client/plugin/pepper_address_resolver.h +++ b/remoting/client/plugin/pepper_address_resolver.h @@ -16,14 +16,13 @@ namespace remoting { class PepperAddressResolver : public rtc::AsyncResolverInterface { public: explicit PepperAddressResolver(const pp::InstanceHandle& instance); - virtual ~PepperAddressResolver(); + ~PepperAddressResolver() override; // rtc::AsyncResolverInterface. - virtual void Start(const rtc::SocketAddress& addr) override; - virtual bool GetResolvedAddress(int family, - rtc::SocketAddress* addr) const override; - virtual int GetError() const override; - virtual void Destroy(bool wait) override; + void Start(const rtc::SocketAddress& addr) override; + bool GetResolvedAddress(int family, rtc::SocketAddress* addr) const override; + int GetError() const override; + void Destroy(bool wait) override; private: void OnResolved(int32_t result); diff --git a/remoting/client/plugin/pepper_audio_player.h b/remoting/client/plugin/pepper_audio_player.h index f86075b..dcf2c6b 100644 --- a/remoting/client/plugin/pepper_audio_player.h +++ b/remoting/client/plugin/pepper_audio_player.h @@ -16,12 +16,11 @@ namespace remoting { class PepperAudioPlayer : public AudioPlayer { public: explicit PepperAudioPlayer(pp::Instance* instance); - virtual ~PepperAudioPlayer(); + ~PepperAudioPlayer() override; - virtual uint32 GetSamplesPerFrame() override; + uint32 GetSamplesPerFrame() override; - virtual bool ResetAudioPlayer(AudioPacket::SamplingRate sampling_rate) - override; + bool ResetAudioPlayer(AudioPacket::SamplingRate sampling_rate) override; private: pp::Instance* instance_; diff --git a/remoting/client/plugin/pepper_entrypoints.cc b/remoting/client/plugin/pepper_entrypoints.cc index b40f90e..e337ed2 100644 --- a/remoting/client/plugin/pepper_entrypoints.cc +++ b/remoting/client/plugin/pepper_entrypoints.cc @@ -18,7 +18,7 @@ namespace remoting { class ChromotingModule : public pp::Module { protected: - virtual ChromotingInstance* CreateInstance(PP_Instance instance) override { + ChromotingInstance* CreateInstance(PP_Instance instance) override { return new ChromotingInstance(instance); } }; diff --git a/remoting/client/plugin/pepper_input_handler.h b/remoting/client/plugin/pepper_input_handler.h index cacfd9d..48d85c2 100644 --- a/remoting/client/plugin/pepper_input_handler.h +++ b/remoting/client/plugin/pepper_input_handler.h @@ -28,7 +28,7 @@ class PepperInputHandler : public pp::MouseLock { public: // |instance| must outlive |this|. explicit PepperInputHandler(pp::Instance* instance); - virtual ~PepperInputHandler(); + ~PepperInputHandler() override; void set_input_stub(protocol::InputStub* input_stub) { input_stub_ = input_stub; @@ -64,7 +64,7 @@ class PepperInputHandler : public pp::MouseLock { }; // pp::MouseLock interface. - virtual void MouseLockLost() override; + void MouseLockLost() override; // Requests the browser to lock the mouse and hides the cursor. void RequestMouseLock(); diff --git a/remoting/client/plugin/pepper_network_manager.h b/remoting/client/plugin/pepper_network_manager.h index 4525522..c761d3a 100644 --- a/remoting/client/plugin/pepper_network_manager.h +++ b/remoting/client/plugin/pepper_network_manager.h @@ -24,11 +24,11 @@ namespace remoting { class PepperNetworkManager : public rtc::NetworkManagerBase { public: PepperNetworkManager(const pp::InstanceHandle& instance); - virtual ~PepperNetworkManager(); + ~PepperNetworkManager() override; // NetworkManager interface. - virtual void StartUpdating() override; - virtual void StopUpdating() override; + void StartUpdating() override; + void StopUpdating() override; private: static void OnNetworkListCallbackHandler(void* user_data, diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc index 713973e..2960a7f 100644 --- a/remoting/client/plugin/pepper_packet_socket_factory.cc +++ b/remoting/client/plugin/pepper_packet_socket_factory.cc @@ -86,7 +86,7 @@ int PepperErrorToNetError(int error) { class UdpPacketSocket : public rtc::AsyncPacketSocket { public: explicit UdpPacketSocket(const pp::InstanceHandle& instance); - virtual ~UdpPacketSocket(); + ~UdpPacketSocket() override; // |min_port| and |max_port| are set to zero if the port number // should be assigned by the OS. @@ -95,20 +95,21 @@ class UdpPacketSocket : public rtc::AsyncPacketSocket { int max_port); // rtc::AsyncPacketSocket interface. - virtual rtc::SocketAddress GetLocalAddress() const override; - virtual rtc::SocketAddress GetRemoteAddress() const override; - virtual int Send(const void* data, size_t data_size, - const rtc::PacketOptions& options) override; - virtual int SendTo(const void* data, - size_t data_size, - const rtc::SocketAddress& address, - const rtc::PacketOptions& options) override; - virtual int Close() override; - virtual State GetState() const override; - virtual int GetOption(rtc::Socket::Option opt, int* value) override; - virtual int SetOption(rtc::Socket::Option opt, int value) override; - virtual int GetError() const override; - virtual void SetError(int error) override; + rtc::SocketAddress GetLocalAddress() const override; + rtc::SocketAddress GetRemoteAddress() const override; + int Send(const void* data, + size_t data_size, + const rtc::PacketOptions& options) override; + int SendTo(const void* data, + size_t data_size, + const rtc::SocketAddress& address, + const rtc::PacketOptions& options) override; + int Close() override; + State GetState() const override; + int GetOption(rtc::Socket::Option opt, int* value) override; + int SetOption(rtc::Socket::Option opt, int value) override; + int GetError() const override; + void SetError(int error) override; private: struct PendingPacket { diff --git a/remoting/client/plugin/pepper_packet_socket_factory.h b/remoting/client/plugin/pepper_packet_socket_factory.h index 1cd15e7..6fcf0a4 100644 --- a/remoting/client/plugin/pepper_packet_socket_factory.h +++ b/remoting/client/plugin/pepper_packet_socket_factory.h @@ -14,23 +14,24 @@ namespace remoting { class PepperPacketSocketFactory : public rtc::PacketSocketFactory { public: explicit PepperPacketSocketFactory(const pp::InstanceHandle& instance); - virtual ~PepperPacketSocketFactory(); + ~PepperPacketSocketFactory() override; - virtual rtc::AsyncPacketSocket* CreateUdpSocket( + rtc::AsyncPacketSocket* CreateUdpSocket( const rtc::SocketAddress& local_address, - int min_port, int max_port) override; - virtual rtc::AsyncPacketSocket* CreateServerTcpSocket( + int min_port, + int max_port) override; + rtc::AsyncPacketSocket* CreateServerTcpSocket( const rtc::SocketAddress& local_address, int min_port, int max_port, int opts) override; - virtual rtc::AsyncPacketSocket* CreateClientTcpSocket( + rtc::AsyncPacketSocket* CreateClientTcpSocket( const rtc::SocketAddress& local_address, const rtc::SocketAddress& remote_address, const rtc::ProxyInfo& proxy_info, const std::string& user_agent, int opts) override; - virtual rtc::AsyncResolverInterface* CreateAsyncResolver() override; + rtc::AsyncResolverInterface* CreateAsyncResolver() override; private: const pp::InstanceHandle pp_instance_; diff --git a/remoting/client/plugin/pepper_plugin_thread_delegate.h b/remoting/client/plugin/pepper_plugin_thread_delegate.h index aa3ce33..eb6ddb3 100644 --- a/remoting/client/plugin/pepper_plugin_thread_delegate.h +++ b/remoting/client/plugin/pepper_plugin_thread_delegate.h @@ -16,10 +16,11 @@ namespace remoting { class PepperPluginThreadDelegate : public PluginThreadTaskRunner::Delegate { public: PepperPluginThreadDelegate(); - virtual ~PepperPluginThreadDelegate(); + ~PepperPluginThreadDelegate() override; - virtual bool RunOnPluginThread( - base::TimeDelta delay, void(CDECL function)(void*), void* data) override; + bool RunOnPluginThread(base::TimeDelta delay, + void(CDECL function)(void*), + void* data) override; private: pp::Core* core_; diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc index e03d050..a601480 100644 --- a/remoting/client/plugin/pepper_port_allocator.cc +++ b/remoting/client/plugin/pepper_port_allocator.cc @@ -37,12 +37,12 @@ class PepperPortAllocatorSession const std::vector<std::string>& relay_hosts, const std::string& relay_token, const pp::InstanceHandle& instance); - virtual ~PepperPortAllocatorSession(); + ~PepperPortAllocatorSession() override; // cricket::HttpPortAllocatorBase overrides. - virtual void ConfigReady(cricket::PortConfiguration* config) override; - virtual void GetPortConfigurations() override; - virtual void SendSessionRequest(const std::string& host, int port) override; + void ConfigReady(cricket::PortConfiguration* config) override; + void GetPortConfigurations() override; + void SendSessionRequest(const std::string& host, int port) override; private: void OnUrlOpened(int32_t result); diff --git a/remoting/client/plugin/pepper_port_allocator.h b/remoting/client/plugin/pepper_port_allocator.h index 37887a7..c6c3de7 100644 --- a/remoting/client/plugin/pepper_port_allocator.h +++ b/remoting/client/plugin/pepper_port_allocator.h @@ -25,10 +25,10 @@ class PepperPortAllocator : public cricket::HttpPortAllocatorBase { public: static scoped_ptr<PepperPortAllocator> Create( const pp::InstanceHandle& instance); - virtual ~PepperPortAllocator(); + ~PepperPortAllocator() override; // cricket::HttpPortAllocatorBase overrides. - virtual cricket::PortAllocatorSession* CreateSessionInternal( + cricket::PortAllocatorSession* CreateSessionInternal( const std::string& content_name, int component, const std::string& ice_username_fragment, diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h index 37f3a89..388bd9a 100644 --- a/remoting/client/plugin/pepper_view.h +++ b/remoting/client/plugin/pepper_view.h @@ -38,22 +38,22 @@ class PepperView : public FrameConsumer { // Constructs a PepperView for the |instance|. The |instance| and |context| // must outlive this class. PepperView(ChromotingInstance* instance, ClientContext* context); - virtual ~PepperView(); + ~PepperView() override; // Allocates buffers and passes them to the FrameProducer to render into until // the maximum number of buffers are in-flight. void Initialize(FrameProducer* producer); // FrameConsumer implementation. - virtual void ApplyBuffer(const webrtc::DesktopSize& view_size, - const webrtc::DesktopRect& clip_area, - webrtc::DesktopFrame* buffer, - const webrtc::DesktopRegion& region, - const webrtc::DesktopRegion& shape) override; - virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) override; - virtual void SetSourceSize(const webrtc::DesktopSize& source_size, - const webrtc::DesktopVector& dpi) override; - virtual PixelFormat GetPixelFormat() override; + void ApplyBuffer(const webrtc::DesktopSize& view_size, + const webrtc::DesktopRect& clip_area, + webrtc::DesktopFrame* buffer, + const webrtc::DesktopRegion& region, + const webrtc::DesktopRegion& shape) override; + void ReturnBuffer(webrtc::DesktopFrame* buffer) override; + void SetSourceSize(const webrtc::DesktopSize& source_size, + const webrtc::DesktopVector& dpi) override; + PixelFormat GetPixelFormat() override; // Updates the PepperView's size & clipping area, taking into account the // DIP-to-device scale factor. diff --git a/remoting/client/software_video_renderer.cc b/remoting/client/software_video_renderer.cc index 23049fc..96758b3 100644 --- a/remoting/client/software_video_renderer.cc +++ b/remoting/client/software_video_renderer.cc @@ -37,24 +37,24 @@ class RgbToBgrVideoDecoderFilter : public VideoDecoder { : parent_(parent.Pass()) { } - virtual void Initialize(const webrtc::DesktopSize& screen_size) override { + void Initialize(const webrtc::DesktopSize& screen_size) override { parent_->Initialize(screen_size); } - virtual bool DecodePacket(const VideoPacket& packet) override { + bool DecodePacket(const VideoPacket& packet) override { return parent_->DecodePacket(packet); } - virtual void Invalidate(const webrtc::DesktopSize& view_size, - const webrtc::DesktopRegion& region) override { + void Invalidate(const webrtc::DesktopSize& view_size, + const webrtc::DesktopRegion& region) override { return parent_->Invalidate(view_size, region); } - virtual void RenderFrame(const webrtc::DesktopSize& view_size, - const webrtc::DesktopRect& clip_area, - uint8* image_buffer, - int image_stride, - webrtc::DesktopRegion* output_region) override { + void RenderFrame(const webrtc::DesktopSize& view_size, + const webrtc::DesktopRect& clip_area, + uint8* image_buffer, + int image_stride, + webrtc::DesktopRegion* output_region) override { parent_->RenderFrame(view_size, clip_area, image_buffer, image_stride, output_region); @@ -68,7 +68,7 @@ class RgbToBgrVideoDecoderFilter : public VideoDecoder { } } - virtual const webrtc::DesktopRegion* GetImageShape() override { + const webrtc::DesktopRegion* GetImageShape() override { return parent_->GetImageShape(); } diff --git a/remoting/client/software_video_renderer.h b/remoting/client/software_video_renderer.h index ee05d11..f698e4b 100644 --- a/remoting/client/software_video_renderer.h +++ b/remoting/client/software_video_renderer.h @@ -39,13 +39,13 @@ class SoftwareVideoRenderer : public VideoRenderer, scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, scoped_refptr<base::SingleThreadTaskRunner> decode_task_runner, scoped_refptr<FrameConsumerProxy> consumer); - virtual ~SoftwareVideoRenderer(); + ~SoftwareVideoRenderer() override; // VideoRenderer implementation. - virtual void Initialize(const protocol::SessionConfig& config) override; - virtual ChromotingStats* GetStats() override; - virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet, - const base::Closure& done) override; + void Initialize(const protocol::SessionConfig& config) override; + ChromotingStats* GetStats() override; + void ProcessVideoPacket(scoped_ptr<VideoPacket> packet, + const base::Closure& done) override; // FrameProducer implementation. These methods may be called before we are // Initialize()d, or we know the source screen size. These methods may be @@ -54,12 +54,11 @@ class SoftwareVideoRenderer : public VideoRenderer, // TODO(sergeyu): On Android a separate display thread is used for drawing. // FrameConsumer calls FrameProducer on that thread. Can we avoid having a // separate display thread? E.g. can we do everything on the decode thread? - virtual void DrawBuffer(webrtc::DesktopFrame* buffer) override; - virtual void InvalidateRegion(const webrtc::DesktopRegion& region) override; - virtual void RequestReturnBuffers(const base::Closure& done) override; - virtual void SetOutputSizeAndClip( - const webrtc::DesktopSize& view_size, - const webrtc::DesktopRect& clip_area) override; + void DrawBuffer(webrtc::DesktopFrame* buffer) override; + void InvalidateRegion(const webrtc::DesktopRegion& region) override; + void RequestReturnBuffers(const base::Closure& done) override; + void SetOutputSizeAndClip(const webrtc::DesktopSize& view_size, + const webrtc::DesktopRect& clip_area) override; private: class Core; diff --git a/remoting/client/token_fetcher_proxy.h b/remoting/client/token_fetcher_proxy.h index 708bf81..e71aa04 100644 --- a/remoting/client/token_fetcher_proxy.h +++ b/remoting/client/token_fetcher_proxy.h @@ -22,10 +22,10 @@ class TokenFetcherProxy TokenFetcherProxy(const TokenFetcherCallback& token_fetcher_impl, const std::string& host_public_key); - virtual ~TokenFetcherProxy(); + ~TokenFetcherProxy() override; // protocol::TokenClientAuthenticator::TokenFetcher interface. - virtual void FetchThirdPartyToken( + void FetchThirdPartyToken( const GURL& token_url, const std::string& scope, const TokenFetchedCallback& token_fetched_callback) override; |