Commit 11d989c5 authored by mostynb's avatar mostynb Committed by Commit bot

replace OVERRIDE and FINAL with override and final in remoting/

BUG=417463

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

Cr-Commit-Position: refs/heads/master@{#298734}
parent c9d7a691
......@@ -83,7 +83,7 @@ class AutoThread : base::PlatformThread::Delegate {
void JoinAndDeleteThread();
// base::PlatformThread::Delegate methods:
virtual void ThreadMain() OVERRIDE;
virtual void ThreadMain() override;
// Used to pass data to ThreadMain.
struct StartupData;
......
......@@ -28,12 +28,12 @@ class AutoThreadTaskRunner : public base::SingleThreadTaskRunner {
virtual bool PostDelayedTask(
const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) OVERRIDE;
base::TimeDelta delay) override;
virtual bool PostNonNestableDelayedTask(
const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) OVERRIDE;
virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
base::TimeDelta delay) override;
virtual bool RunsTasksOnCurrentThread() const override;
private:
virtual ~AutoThreadTaskRunner();
......
......@@ -72,14 +72,14 @@ class AutoThreadTest : public testing::Test {
message_loop_.Run();
}
virtual void SetUp() OVERRIDE {
virtual void SetUp() override {
main_task_runner_ = new AutoThreadTaskRunner(
message_loop_.message_loop_proxy(),
base::Bind(&AutoThreadTest::QuitMainMessageLoop,
base::Unretained(this)));
}
virtual void TearDown() OVERRIDE {
virtual void TearDown() override {
// Verify that |message_loop_| was quit by the AutoThreadTaskRunner.
EXPECT_TRUE(message_loop_quit_correctly_);
}
......
......@@ -71,7 +71,7 @@ class BreakpadWinDeathTest : public testing::Test {
BreakpadWinDeathTest();
virtual ~BreakpadWinDeathTest();
virtual void SetUp() OVERRIDE;
virtual void SetUp() override;
protected:
scoped_ptr<google_breakpad::CrashGenerationServer> crash_server_;
......
......@@ -108,10 +108,10 @@ class CompoundBufferInputStream
int position() const { return position_; }
// google::protobuf::io::ZeroCopyInputStream interface.
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;
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_;
......
......@@ -49,12 +49,12 @@ class PluginThreadTaskRunner : public base::SingleThreadTaskRunner {
virtual bool PostDelayedTask(
const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) OVERRIDE;
base::TimeDelta delay) override;
virtual bool PostNonNestableDelayedTask(
const tracked_objects::Location& from_here,
const base::Closure& task,
base::TimeDelta delay) OVERRIDE;
virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
base::TimeDelta delay) override;
virtual bool RunsTasksOnCurrentThread() const override;
protected:
virtual ~PluginThreadTaskRunner();
......
......@@ -15,11 +15,11 @@ class ResourcesTest : public testing::Test {
ResourcesTest(): resources_available_(false) {
}
virtual void SetUp() OVERRIDE {
virtual void SetUp() override {
resources_available_ = LoadResources("en-US");
}
virtual void TearDown() OVERRIDE {
virtual void TearDown() override {
UnloadResources();
}
......
......@@ -26,9 +26,9 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
// Overridden from net::URLRequestContextGetter:
virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
virtual net::URLRequestContext* GetURLRequestContext() override;
virtual scoped_refptr<base::SingleThreadTaskRunner>
GetNetworkTaskRunner() const OVERRIDE;
GetNetworkTaskRunner() const override;
protected:
virtual ~URLRequestContextGetter();
......
......@@ -19,7 +19,7 @@ class VlogNetLog::Observer : public net::NetLog::ThreadSafeObserver {
virtual ~Observer();
// NetLog::ThreadSafeObserver overrides:
virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE;
virtual void OnAddEntry(const net::NetLog::Entry& entry) override;
private:
DISALLOW_COPY_AND_ASSIGN(Observer);
......
......@@ -36,7 +36,7 @@ class AudioDecodeScheduler : public protocol::AudioStub {
// AudioStub implementation.
virtual void ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
const base::Closure& done) OVERRIDE;
const base::Closure& done) override;
private:
class Core;
......
......@@ -29,11 +29,11 @@ class FakeAudioPlayer : public AudioPlayer {
FakeAudioPlayer() {
}
virtual bool ResetAudioPlayer(AudioPacket::SamplingRate) OVERRIDE {
virtual bool ResetAudioPlayer(AudioPacket::SamplingRate) override {
return true;
}
virtual uint32 GetSamplesPerFrame() OVERRIDE {
virtual uint32 GetSamplesPerFrame() override {
return kAudioSamplesPerFrame;
}
};
......
......@@ -72,27 +72,27 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
// ClientStub implementation.
virtual void SetCapabilities(
const protocol::Capabilities& capabilities) OVERRIDE;
const protocol::Capabilities& capabilities) override;
virtual void SetPairingResponse(
const protocol::PairingResponse& pairing_response) OVERRIDE;
const protocol::PairingResponse& pairing_response) override;
virtual void DeliverHostMessage(
const protocol::ExtensionMessage& message) OVERRIDE;
const protocol::ExtensionMessage& message) override;
// ClipboardStub implementation for receiving clipboard data from host.
virtual void InjectClipboardEvent(
const protocol::ClipboardEvent& event) OVERRIDE;
const protocol::ClipboardEvent& event) override;
// CursorShapeStub implementation for receiving cursor shape updates.
virtual void SetCursorShape(
const protocol::CursorShapeInfo& cursor_shape) OVERRIDE;
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;
protocol::ErrorCode error) override;
virtual void OnConnectionReady(bool ready) override;
virtual void OnRouteChanged(const std::string& channel_name,
const protocol::TransportRoute& route) OVERRIDE;
const protocol::TransportRoute& route) override;
private:
// Called when the connection is authenticated.
......
......@@ -65,7 +65,7 @@ MATCHER(IsStatisticsLog, "") {
class ClientStatusLoggerTest : public testing::Test {
public:
ClientStatusLoggerTest() {}
virtual void SetUp() OVERRIDE {
virtual void SetUp() override {
EXPECT_CALL(signal_strategy_, AddListener(_));
EXPECT_CALL(signal_strategy_, RemoveListener(_));
message_loop_proxy_ = base::MessageLoopProxy::current();
......
......@@ -34,11 +34,11 @@ class FrameConsumerProxy
const webrtc::DesktopRect& clip_area,
webrtc::DesktopFrame* buffer,
const webrtc::DesktopRegion& region,
const webrtc::DesktopRegion& shape) OVERRIDE;
virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
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;
const webrtc::DesktopVector& dpi) override;
virtual PixelFormat GetPixelFormat() override;
private:
friend class base::RefCountedThreadSafe<FrameConsumerProxy>;
......
......@@ -96,24 +96,24 @@ class ChromotingJniInstance
// ClientUserInterface implementation.
virtual void OnConnectionState(
protocol::ConnectionToHost::State state,
protocol::ErrorCode error) OVERRIDE;
virtual void OnConnectionReady(bool ready) OVERRIDE;
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;
const protocol::TransportRoute& route) override;
virtual void SetCapabilities(const std::string& capabilities) override;
virtual void SetPairingResponse(
const protocol::PairingResponse& response) OVERRIDE;
const protocol::PairingResponse& response) override;
virtual void DeliverHostMessage(
const protocol::ExtensionMessage& message) OVERRIDE;
virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE;
virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE;
const protocol::ExtensionMessage& message) override;
virtual protocol::ClipboardStub* GetClipboardStub() override;
virtual protocol::CursorShapeStub* GetCursorShapeStub() override;
// CursorShapeStub implementation.
virtual void InjectClipboardEvent(
const protocol::ClipboardEvent& event) OVERRIDE;
const protocol::ClipboardEvent& event) override;
// ClipboardStub implementation.
virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) OVERRIDE;
virtual void SetCursorShape(const protocol::CursorShapeInfo& shape) override;
private:
// This object is ref-counted, so it cleans itself up.
......
......@@ -44,11 +44,11 @@ class JniFrameConsumer : public FrameConsumer {
const webrtc::DesktopRect& clip_area,
webrtc::DesktopFrame* buffer,
const webrtc::DesktopRegion& region,
const webrtc::DesktopRegion& shape) OVERRIDE;
virtual void ReturnBuffer(webrtc::DesktopFrame* buffer) OVERRIDE;
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;
const webrtc::DesktopVector& dpi) override;
virtual PixelFormat GetPixelFormat() override;
private:
// Allocates a new buffer of |source_size|, informs Java about it, and tells
......
......@@ -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;
virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
private:
std::map<uint32,uint32> mapped_keys;
......
......@@ -107,34 +107,34 @@ class ChromotingInstance :
virtual ~ChromotingInstance();
// pp::Instance interface.
virtual void DidChangeFocus(bool has_focus) OVERRIDE;
virtual void DidChangeView(const pp::View& view) OVERRIDE;
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;
const char* argv[]) override;
virtual void HandleMessage(const pp::Var& message) override;
virtual 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;
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;
const protocol::TransportRoute& route) override;
virtual void SetCapabilities(const std::string& capabilities) override;
virtual void SetPairingResponse(
const protocol::PairingResponse& pairing_response) OVERRIDE;
const protocol::PairingResponse& pairing_response) override;
virtual void DeliverHostMessage(
const protocol::ExtensionMessage& message) OVERRIDE;
virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE;
virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE;
const protocol::ExtensionMessage& message) override;
virtual protocol::ClipboardStub* GetClipboardStub() override;
virtual protocol::CursorShapeStub* GetCursorShapeStub() override;
// protocol::ClipboardStub interface.
virtual void InjectClipboardEvent(
const protocol::ClipboardEvent& event) OVERRIDE;
const protocol::ClipboardEvent& event) override;
// protocol::CursorShapeStub interface.
virtual void SetCursorShape(
const protocol::CursorShapeInfo& cursor_shape) OVERRIDE;
const protocol::CursorShapeInfo& cursor_shape) override;
// Called by PepperView.
void SetDesktopSize(const webrtc::DesktopSize& size,
......@@ -245,11 +245,11 @@ class ChromotingInstance :
// 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;
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;
bool keyframe) override;
bool initialized_;
......
......@@ -26,15 +26,15 @@ class DelegatingSignalStrategy : public SignalStrategy {
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;
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;
private:
std::string local_jid_;
......
......@@ -28,12 +28,12 @@ class MediaSourceVideoRenderer::VideoWriter : public mkvmuxer::IMkvWriter {
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 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::int64 position) override;
scoped_ptr<DataBuffer> OnVideoFrame(const std::string& video_data,
bool keyframe);
......
......@@ -46,10 +46,10 @@ class MediaSourceVideoRenderer : public VideoRenderer {
virtual ~MediaSourceVideoRenderer();
// VideoRenderer interface.
virtual void Initialize(const protocol::SessionConfig& config) OVERRIDE;
virtual ChromotingStats* GetStats() OVERRIDE;
virtual void Initialize(const protocol::SessionConfig& config) override;
virtual ChromotingStats* GetStats() override;
virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
const base::Closure& done) OVERRIDE;
const base::Closure& done) override;
private:
// Helper class used to generate WebM stream.
......
......@@ -26,8 +26,8 @@ class NormalizingInputFilterCros : public protocol::InputFilter {
virtual ~NormalizingInputFilterCros();
// InputFilter overrides.
virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
virtual void InjectMouseEvent(const protocol::MouseEvent& event) override;
private:
void ProcessKeyDown(const protocol::KeyEvent& event);
......
......@@ -48,7 +48,7 @@ class NormalizingInputFilterMac : public protocol::InputFilter {
virtual ~NormalizingInputFilterMac();
// InputFilter overrides.
virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
virtual void InjectKeyEvent(const protocol::KeyEvent& event) override;
private:
typedef std::map<int, protocol::KeyEvent> KeyPressedMap;
......
......@@ -19,11 +19,11 @@ class PepperAddressResolver : public rtc::AsyncResolverInterface {
virtual ~PepperAddressResolver();
// rtc::AsyncResolverInterface.
virtual void Start(const rtc::SocketAddress& addr) OVERRIDE;
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;
rtc::SocketAddress* addr) const override;
virtual int GetError() const override;
virtual void Destroy(bool wait) override;
private:
void OnResolved(int32_t result);
......
......@@ -18,10 +18,10 @@ class PepperAudioPlayer : public AudioPlayer {
explicit PepperAudioPlayer(pp::Instance* instance);
virtual ~PepperAudioPlayer();
virtual uint32 GetSamplesPerFrame() OVERRIDE;
virtual uint32 GetSamplesPerFrame() override;
virtual bool ResetAudioPlayer(AudioPacket::SamplingRate sampling_rate)
OVERRIDE;
override;
private:
pp::Instance* instance_;
......
......@@ -18,7 +18,7 @@ namespace remoting {
class ChromotingModule : public pp::Module {
protected:
virtual ChromotingInstance* CreateInstance(PP_Instance instance) OVERRIDE {
virtual ChromotingInstance* CreateInstance(PP_Instance instance) override {
return new ChromotingInstance(instance);
}
};
......
......@@ -64,7 +64,7 @@ class PepperInputHandler : public pp::MouseLock {
};
// pp::MouseLock interface.
virtual void MouseLockLost() OVERRIDE;
virtual void MouseLockLost() override;
// Requests the browser to lock the mouse and hides the cursor.
void RequestMouseLock();
......
......@@ -12,7 +12,7 @@ namespace remoting {
class ChromotingModule : public pp::Module {
protected:
virtual pp::Instance* CreateInstance(PP_Instance instance) OVERRIDE {
virtual pp::Instance* CreateInstance(PP_Instance instance) override {
pp::Instance* result = new ChromotingInstance(instance);
return result;
}
......
......@@ -27,8 +27,8 @@ class PepperNetworkManager : public rtc::NetworkManagerBase {
virtual ~PepperNetworkManager();
// NetworkManager interface.
virtual void StartUpdating() OVERRIDE;
virtual void StopUpdating() OVERRIDE;
virtual void StartUpdating() override;
virtual void StopUpdating() override;
private:
static void OnNetworkListCallbackHandler(void* user_data,
......
......@@ -95,20 +95,20 @@ class UdpPacketSocket : public rtc::AsyncPacketSocket {
int max_port);
// rtc::AsyncPacketSocket interface.
virtual rtc::SocketAddress GetLocalAddress() const OVERRIDE;
virtual rtc::SocketAddress GetRemoteAddress() const OVERRIDE;
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;
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;
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;
private:
struct PendingPacket {
......
......@@ -18,19 +18,19 @@ class PepperPacketSocketFactory : public rtc::PacketSocketFactory {
virtual rtc::AsyncPacketSocket* CreateUdpSocket(
const rtc::SocketAddress& local_address,
int min_port, int max_port) OVERRIDE;
int min_port, int max_port) override;
virtual rtc::AsyncPacketSocket* CreateServerTcpSocket(
const rtc::SocketAddress& local_address,
int min_port,
int max_port,
int opts) OVERRIDE;
int opts) override;
virtual 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)