summaryrefslogtreecommitdiffstats
path: root/media/cast/logging
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-06 18:04:44 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 01:05:52 +0000
commit2da2112cb906481f3c280a2b4fac2927619d6df0 (patch)
tree2da9215cd888cc4ca935d36376d59bc6f0bdab3d /media/cast/logging
parent886aeccd3824618309ccce5eabb2a70241073bc9 (diff)
downloadchromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.zip
chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.tar.gz
chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.tar.bz2
replace OVERRIDE and FINAL with override and final in media/
BUG=417463 Review URL: https://codereview.chromium.org/623263003 Cr-Commit-Position: refs/heads/master@{#298317}
Diffstat (limited to 'media/cast/logging')
-rw-r--r--media/cast/logging/encoding_event_subscriber.h4
-rw-r--r--media/cast/logging/receiver_time_offset_estimator_impl.h6
-rw-r--r--media/cast/logging/simple_event_subscriber.h4
-rw-r--r--media/cast/logging/stats_event_subscriber.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/media/cast/logging/encoding_event_subscriber.h b/media/cast/logging/encoding_event_subscriber.h
index ca2cccb..58dccbb 100644
--- a/media/cast/logging/encoding_event_subscriber.h
+++ b/media/cast/logging/encoding_event_subscriber.h
@@ -52,8 +52,8 @@ class EncodingEventSubscriber : public RawEventSubscriber {
virtual ~EncodingEventSubscriber();
// RawReventSubscriber implementations.
- virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE;
- virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE;
+ virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override;
+ virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override;
// Assigns frame events and packet events received so far to |frame_events|
// and |packet_events| and resets the internal state.
diff --git a/media/cast/logging/receiver_time_offset_estimator_impl.h b/media/cast/logging/receiver_time_offset_estimator_impl.h
index 768ccbd..f39cfa2 100644
--- a/media/cast/logging/receiver_time_offset_estimator_impl.h
+++ b/media/cast/logging/receiver_time_offset_estimator_impl.h
@@ -39,12 +39,12 @@ class ReceiverTimeOffsetEstimatorImpl : public ReceiverTimeOffsetEstimator {
virtual ~ReceiverTimeOffsetEstimatorImpl();
// RawEventSubscriber implementations.
- virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE;
- virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE;
+ virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override;
+ virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override;
// ReceiverTimeOffsetEstimator implementation.
virtual bool GetReceiverOffsetBounds(base::TimeDelta* lower_bound,
- base::TimeDelta* upper_bound) OVERRIDE;
+ base::TimeDelta* upper_bound) override;
private:
// This helper uses the difference between sent and recived event
diff --git a/media/cast/logging/simple_event_subscriber.h b/media/cast/logging/simple_event_subscriber.h
index adc4763..3f816e0 100644
--- a/media/cast/logging/simple_event_subscriber.h
+++ b/media/cast/logging/simple_event_subscriber.h
@@ -25,8 +25,8 @@ class SimpleEventSubscriber : public RawEventSubscriber {
virtual ~SimpleEventSubscriber();
// RawEventSubscriber implementations.
- virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE;
- virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE;
+ virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override;
+ virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override;
// Assigns frame events received so far to |frame_events| and clears them
// from this object.
diff --git a/media/cast/logging/stats_event_subscriber.h b/media/cast/logging/stats_event_subscriber.h
index 7662e60..d376313 100644
--- a/media/cast/logging/stats_event_subscriber.h
+++ b/media/cast/logging/stats_event_subscriber.h
@@ -35,8 +35,8 @@ class StatsEventSubscriber : public RawEventSubscriber {
virtual ~StatsEventSubscriber();
// RawReventSubscriber implementations.
- virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE;
- virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE;
+ virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override;
+ virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override;
// Returns stats as a DictionaryValue. The dictionary contains one entry -
// "audio" or "video" pointing to an inner dictionary.