diff options
author | dcheng <dcheng@chromium.org> | 2014-10-27 16:57:05 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-27 23:58:04 +0000 |
commit | 1f4538e02ae35659abf7f9468639a1045924af50 (patch) | |
tree | 1e076638bbebe64689099c5ea5bd82bfa9c6b9aa /ash/touch/touch_hud_projection.cc | |
parent | e19d49ab07f57c16eb6685e7394ac4902e53382c (diff) | |
download | chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.zip chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.tar.gz chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.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=derat@chromium.org
Review URL: https://codereview.chromium.org/680153002
Cr-Commit-Position: refs/heads/master@{#301490}
Diffstat (limited to 'ash/touch/touch_hud_projection.cc')
-rw-r--r-- | ash/touch/touch_hud_projection.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/touch/touch_hud_projection.cc b/ash/touch/touch_hud_projection.cc index 990345e..47fab8d 100644 --- a/ash/touch/touch_hud_projection.cc +++ b/ash/touch/touch_hud_projection.cc @@ -72,13 +72,13 @@ class TouchPointView : public views::View, } private: - virtual ~TouchPointView() { + ~TouchPointView() override { GetWidget()->RemoveObserver(this); parent()->RemoveChildView(this); } // Overridden from views::View. - virtual void OnPaint(gfx::Canvas* canvas) override { + void OnPaint(gfx::Canvas* canvas) override { int alpha = kProjectionAlpha; if (fadeout_) alpha = static_cast<int>(fadeout_->CurrentValueBetween(alpha, 0)); @@ -100,22 +100,22 @@ class TouchPointView : public views::View, } // Overridden from gfx::AnimationDelegate. - virtual void AnimationEnded(const gfx::Animation* animation) override { + void AnimationEnded(const gfx::Animation* animation) override { DCHECK_EQ(fadeout_.get(), animation); delete this; } - virtual void AnimationProgressed(const gfx::Animation* animation) override { + void AnimationProgressed(const gfx::Animation* animation) override { DCHECK_EQ(fadeout_.get(), animation); SchedulePaint(); } - virtual void AnimationCanceled(const gfx::Animation* animation) override { + void AnimationCanceled(const gfx::Animation* animation) override { AnimationEnded(animation); } // Overridden from views::WidgetObserver. - virtual void OnWidgetDestroying(views::Widget* widget) override { + void OnWidgetDestroying(views::Widget* widget) override { if (fadeout_) fadeout_->Stop(); else |