summaryrefslogtreecommitdiffstats
path: root/cc/base
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 02:51:08 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 09:51:37 +0000
commit716bedf160f4c4c1945cab54c3f490424a0eb779 (patch)
treec9592751a48527e3278a8a1e001b0569c97ff1d5 /cc/base
parent6c879fbd35d14af9ca4fe53bc622edac2d3fd5f1 (diff)
downloadchromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.zip
chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.tar.gz
chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.tar.bz2
Standardize usage of virtual/override/final in cc/
BUG=417463 TBR=enne@chromium.org Review URL: https://codereview.chromium.org/645853008 Cr-Commit-Position: refs/heads/master@{#300439}
Diffstat (limited to 'cc/base')
-rw-r--r--cc/base/delayed_unique_notifier_unittest.cc4
-rw-r--r--cc/base/latency_info_swap_promise.h8
-rw-r--r--cc/base/latency_info_swap_promise_monitor.h8
3 files changed, 10 insertions, 10 deletions
diff --git a/cc/base/delayed_unique_notifier_unittest.cc b/cc/base/delayed_unique_notifier_unittest.cc
index 090da33..41cde83 100644
--- a/cc/base/delayed_unique_notifier_unittest.cc
+++ b/cc/base/delayed_unique_notifier_unittest.cc
@@ -20,10 +20,10 @@ class TestNotifier : public DelayedUniqueNotifier {
const base::Closure& closure,
const base::TimeDelta& delay)
: DelayedUniqueNotifier(task_runner, closure, delay) {}
- virtual ~TestNotifier() {}
+ ~TestNotifier() override {}
// Overridden from DelayedUniqueNotifier:
- virtual base::TimeTicks Now() const override { return now_; }
+ base::TimeTicks Now() const override { return now_; }
void SetNow(base::TimeTicks now) { now_ = now; }
diff --git a/cc/base/latency_info_swap_promise.h b/cc/base/latency_info_swap_promise.h
index b912f24..a7941f1 100644
--- a/cc/base/latency_info_swap_promise.h
+++ b/cc/base/latency_info_swap_promise.h
@@ -14,12 +14,12 @@ namespace cc {
class CC_EXPORT LatencyInfoSwapPromise : public SwapPromise {
public:
explicit LatencyInfoSwapPromise(const ui::LatencyInfo& latency_info);
- virtual ~LatencyInfoSwapPromise();
+ ~LatencyInfoSwapPromise() override;
- virtual void DidSwap(CompositorFrameMetadata* metadata) override;
- virtual void DidNotSwap(DidNotSwapReason reason) override;
+ void DidSwap(CompositorFrameMetadata* metadata) override;
+ void DidNotSwap(DidNotSwapReason reason) override;
- virtual int64 TraceId() const override;
+ int64 TraceId() const override;
private:
ui::LatencyInfo latency_;
diff --git a/cc/base/latency_info_swap_promise_monitor.h b/cc/base/latency_info_swap_promise_monitor.h
index cf1dc1d..d9e71fb 100644
--- a/cc/base/latency_info_swap_promise_monitor.h
+++ b/cc/base/latency_info_swap_promise_monitor.h
@@ -22,11 +22,11 @@ class CC_EXPORT LatencyInfoSwapPromiseMonitor : public SwapPromiseMonitor {
LatencyInfoSwapPromiseMonitor(ui::LatencyInfo* latency,
LayerTreeHost* layer_tree_host,
LayerTreeHostImpl* layer_tree_host_impl);
- virtual ~LatencyInfoSwapPromiseMonitor();
+ ~LatencyInfoSwapPromiseMonitor() override;
- virtual void OnSetNeedsCommitOnMain() override;
- virtual void OnSetNeedsRedrawOnImpl() override;
- virtual void OnForwardScrollUpdateToMainThreadOnImpl() override;
+ void OnSetNeedsCommitOnMain() override;
+ void OnSetNeedsRedrawOnImpl() override;
+ void OnForwardScrollUpdateToMainThreadOnImpl() override;
private:
ui::LatencyInfo* latency_;