Commit 4bf13035 authored by dcheng's avatar dcheng Committed by Commit bot

Update {virtual,override,final} to follow C++11 style in remoting.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

This patch was automatically generated with an OS=android build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463

Review URL: https://codereview.chromium.org/905463005

Cr-Commit-Position: refs/heads/master@{#314944}
parent aef52682
...@@ -94,30 +94,26 @@ class ChromotingJniInstance ...@@ -94,30 +94,26 @@ class ChromotingJniInstance
void RecordPaintTime(int64 paint_time_ms); void RecordPaintTime(int64 paint_time_ms);
// ClientUserInterface implementation. // ClientUserInterface implementation.
virtual void OnConnectionState( void OnConnectionState(protocol::ConnectionToHost::State state,
protocol::ConnectionToHost::State state, protocol::ErrorCode error) override;
protocol::ErrorCode error) override; void OnConnectionReady(bool ready) override;
virtual void OnConnectionReady(bool ready) override; void OnRouteChanged(const std::string& channel_name,
virtual void OnRouteChanged(const std::string& channel_name, const protocol::TransportRoute& route) override;
const protocol::TransportRoute& route) override; void SetCapabilities(const std::string& capabilities) override;
virtual void SetCapabilities(const std::string& capabilities) override; void SetPairingResponse(const protocol::PairingResponse& response) override;
virtual void SetPairingResponse( void DeliverHostMessage(const protocol::ExtensionMessage& message) override;
const protocol::PairingResponse& response) override; protocol::ClipboardStub* GetClipboardStub() override;
virtual void DeliverHostMessage( protocol::CursorShapeStub* GetCursorShapeStub() override;
const protocol::ExtensionMessage& message) override;
virtual protocol::ClipboardStub* GetClipboardStub() override;
virtual protocol::CursorShapeStub* GetCursorShapeStub() override;
// CursorShapeStub implementation. // CursorShapeStub implementation.
virtual void InjectClipboardEvent( void InjectClipboardEvent(const protocol::ClipboardEvent& event) override;
const protocol::ClipboardEvent& event) override;
// ClipboardStub implementation. // ClipboardStub implementation.
virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) override; void SetCursorShape(const protocol::CursorShapeInfo& shape) override;
private: private:
// This object is ref-counted, so it cleans itself up. // This object is ref-counted, so it cleans itself up.
virtual ~ChromotingJniInstance(); ~ChromotingJniInstance() override;
void ConnectToHostOnDisplayThread(); void ConnectToHostOnDisplayThread();
void ConnectToHostOnNetworkThread(); void ConnectToHostOnNetworkThread();
......
...@@ -34,21 +34,21 @@ class JniFrameConsumer : public FrameConsumer { ...@@ -34,21 +34,21 @@ class JniFrameConsumer : public FrameConsumer {
explicit JniFrameConsumer(ChromotingJniRuntime* jni_runtime, explicit JniFrameConsumer(ChromotingJniRuntime* jni_runtime,
scoped_refptr<ChromotingJniInstance> jni_instance); scoped_refptr<ChromotingJniInstance> jni_instance);
virtual ~JniFrameConsumer(); ~JniFrameConsumer() override;
// This must be called once before the producer's source size is set. // This must be called once before the producer's source size is set.
void set_frame_producer(FrameProducer* producer); void set_frame_producer(FrameProducer* producer);
// FrameConsumer implementation. // FrameConsumer implementation.
virtual void ApplyBuffer(const webrtc::DesktopSize& view_size, void ApplyBuffer(const webrtc::DesktopSize& view_size,
const webrtc::DesktopRect& clip_area, const webrtc::DesktopRect& clip_area,
webrtc::DesktopFrame* buffer, webrtc::DesktopFrame* buffer,
const webrtc::DesktopRegion& region, const webrtc::DesktopRegion& region,
const webrtc::DesktopRegion& shape) override; const webrtc::DesktopRegion& shape) override;
virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) override; void ReturnBuffer(webrtc::DesktopFrame* buffer) override;
virtual void SetSourceSize(const webrtc::DesktopSize& source_size, void SetSourceSize(const webrtc::DesktopSize& source_size,
const webrtc::DesktopVector& dpi) override; const webrtc::DesktopVector& dpi) override;
virtual PixelFormat GetPixelFormat() override; PixelFormat GetPixelFormat() override;
private: private:
// Allocates a new buffer of |source_size|, informs Java about it, and tells // Allocates a new buffer of |source_size|, informs Java about it, and tells
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment