summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 15:18:50 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 22:19:17 +0000
commit2dcbdb93081c00d3f0859edf7213a4490f3e671e (patch)
tree70e0c1d97ad97d2bc8a61c7d8427e199ca15dc04 /media/tools
parentcc12a6ab824a40524b5d046b8cd80253d19ff50f (diff)
downloadchromium_src-2dcbdb93081c00d3f0859edf7213a4490f3e671e.zip
chromium_src-2dcbdb93081c00d3f0859edf7213a4490f3e671e.tar.gz
chromium_src-2dcbdb93081c00d3f0859edf7213a4490f3e671e.tar.bz2
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=wolenetz@chromium.org Review URL: https://codereview.chromium.org/661163004 Cr-Commit-Position: refs/heads/master@{#301462}
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/player_x11/data_source_logger.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/media/tools/player_x11/data_source_logger.h b/media/tools/player_x11/data_source_logger.h
index df8840f..13fdc60 100644
--- a/media/tools/player_x11/data_source_logger.h
+++ b/media/tools/player_x11/data_source_logger.h
@@ -19,16 +19,17 @@ class DataSourceLogger : public media::DataSource {
// |data_source|.
DataSourceLogger(scoped_ptr<DataSource> data_source,
bool force_streaming);
- virtual ~DataSourceLogger();
+ ~DataSourceLogger() override;
// media::DataSource implementation.
- virtual void Stop() override;
- virtual void Read(
- int64 position, int size, uint8* data,
- const media::DataSource::ReadCB& read_cb) override;
- virtual bool GetSize(int64* size_out) override;
- virtual bool IsStreaming() override;
- virtual void SetBitrate(int bitrate) override;
+ void Stop() override;
+ void Read(int64 position,
+ int size,
+ uint8* data,
+ const media::DataSource::ReadCB& read_cb) override;
+ bool GetSize(int64* size_out) override;
+ bool IsStreaming() override;
+ void SetBitrate(int bitrate) override;
private:
scoped_ptr<media::DataSource> data_source_;