Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: content/browser/web_contents/aura/window_slider_unittest.cc

Issue 678973004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/web_contents/aura/window_slider_unittest.cc
diff --git a/content/browser/web_contents/aura/window_slider_unittest.cc b/content/browser/web_contents/aura/window_slider_unittest.cc
index a406bfac0cbc791d208b7d8c10c3de17594ef5e7..a1988d4990b1afea4c291864e2cfedbe32cb6293 100644
--- a/content/browser/web_contents/aura/window_slider_unittest.cc
+++ b/content/browser/web_contents/aura/window_slider_unittest.cc
@@ -72,11 +72,11 @@ class NoEventWindowDelegate : public aura::test::TestWindowDelegate {
public:
NoEventWindowDelegate() {
}
- virtual ~NoEventWindowDelegate() {}
+ ~NoEventWindowDelegate() override {}
private:
// Overridden from aura::WindowDelegate:
- virtual bool HasHitTestMask() const override { return true; }
+ bool HasHitTestMask() const override { return true; }
DISALLOW_COPY_AND_ASSIGN(NoEventWindowDelegate);
};
@@ -92,7 +92,7 @@ class WindowSliderDelegateTest : public WindowSlider::Delegate {
slide_aborted_(false),
slider_destroyed_(false) {
}
- virtual ~WindowSliderDelegateTest() {
+ ~WindowSliderDelegateTest() override {
// Make sure slide_completed() gets called if slide_completing() was called.
CHECK(!slide_completing_ || slide_completed_);
}
@@ -127,35 +127,29 @@ class WindowSliderDelegateTest : public WindowSlider::Delegate {
}
// Overridden from WindowSlider::Delegate:
- virtual ui::Layer* CreateBackLayer() override {
+ ui::Layer* CreateBackLayer() override {
if (!can_create_layer_)
return NULL;
created_back_layer_ = true;
return CreateLayerForTest();
}
- virtual ui::Layer* CreateFrontLayer() override {
+ ui::Layer* CreateFrontLayer() override {
if (!can_create_layer_)
return NULL;
created_front_layer_ = true;
return CreateLayerForTest();
}
- virtual void OnWindowSlideCompleted(scoped_ptr<ui::Layer> layer) override {
+ void OnWindowSlideCompleted(scoped_ptr<ui::Layer> layer) override {
slide_completed_ = true;
}
- virtual void OnWindowSlideCompleting() override {
- slide_completing_ = true;
- }
+ void OnWindowSlideCompleting() override { slide_completing_ = true; }
- virtual void OnWindowSlideAborted() override {
- slide_aborted_ = true;
- }
+ void OnWindowSlideAborted() override { slide_aborted_ = true; }
- virtual void OnWindowSliderDestroyed() override {
- slider_destroyed_ = true;
- }
+ void OnWindowSliderDestroyed() override { slider_destroyed_ = true; }
private:
bool can_create_layer_;
@@ -175,11 +169,11 @@ class WindowSliderDeleteOwnerOnDestroy : public WindowSliderDelegateTest {
explicit WindowSliderDeleteOwnerOnDestroy(aura::Window* owner)
: owner_(owner) {
}
- virtual ~WindowSliderDeleteOwnerOnDestroy() {}
+ ~WindowSliderDeleteOwnerOnDestroy() override {}
private:
// Overridden from WindowSlider::Delegate:
- virtual void OnWindowSliderDestroyed() override {
+ void OnWindowSliderDestroyed() override {
WindowSliderDelegateTest::OnWindowSliderDestroyed();
delete owner_;
}
@@ -194,11 +188,11 @@ class WindowSliderDeleteOwnerOnComplete : public WindowSliderDelegateTest {
explicit WindowSliderDeleteOwnerOnComplete(aura::Window* owner)
: owner_(owner) {
}
- virtual ~WindowSliderDeleteOwnerOnComplete() {}
+ ~WindowSliderDeleteOwnerOnComplete() override {}
private:
// Overridden from WindowSlider::Delegate:
- virtual void OnWindowSlideCompleted(scoped_ptr<ui::Layer> layer) override {
+ void OnWindowSlideCompleted(scoped_ptr<ui::Layer> layer) override {
WindowSliderDelegateTest::OnWindowSlideCompleted(layer.Pass());
delete owner_;
}
« no previous file with comments | « content/browser/web_contents/aura/window_slider.cc ('k') | content/browser/web_contents/touch_editable_impl_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698