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

Unified Diff: ash/wm/immersive_fullscreen_controller_unittest.cc

Issue 645513008: 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
« no previous file with comments | « ash/wm/immersive_fullscreen_controller.cc ('k') | ash/wm/lock_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/immersive_fullscreen_controller_unittest.cc
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
index 6295e948bf7d5a5d5b8ea5bd1ce69303082f62e6..7195429f4c4c2f55b4abc4b2567a99f626b1275c 100644
--- a/ash/wm/immersive_fullscreen_controller_unittest.cc
+++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -39,24 +39,22 @@ class MockImmersiveFullscreenControllerDelegate
enabled_(false),
visible_fraction_(1) {
}
- virtual ~MockImmersiveFullscreenControllerDelegate() {}
+ ~MockImmersiveFullscreenControllerDelegate() override {}
// ImmersiveFullscreenController::Delegate overrides:
- virtual void OnImmersiveRevealStarted() override {
+ void OnImmersiveRevealStarted() override {
enabled_ = true;
visible_fraction_ = 0;
}
- virtual void OnImmersiveRevealEnded() override {
- visible_fraction_ = 0;
- }
- virtual void OnImmersiveFullscreenExited() override {
+ void OnImmersiveRevealEnded() override { visible_fraction_ = 0; }
+ void OnImmersiveFullscreenExited() override {
enabled_ = false;
visible_fraction_ = 1;
}
- virtual void SetVisibleFraction(double visible_fraction) override {
+ void SetVisibleFraction(double visible_fraction) override {
visible_fraction_ = visible_fraction;
}
- virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override {
+ std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override {
std::vector<gfx::Rect> bounds_in_screen;
bounds_in_screen.push_back(top_container_view_->GetBoundsInScreen());
return bounds_in_screen;
@@ -81,10 +79,10 @@ class MockImmersiveFullscreenControllerDelegate
class ConsumeEventHandler : public ui::test::TestEventHandler {
public:
ConsumeEventHandler() {}
- virtual ~ConsumeEventHandler() {}
+ ~ConsumeEventHandler() override {}
private:
- virtual void OnEvent(ui::Event* event) override {
+ void OnEvent(ui::Event* event) override {
ui::test::TestEventHandler::OnEvent(event);
if (event->cancelable())
event->SetHandled();
@@ -109,7 +107,7 @@ class ImmersiveFullscreenControllerTest : public ash::test::AshTestBase {
: widget_(NULL),
top_container_(NULL),
content_view_(NULL) {}
- virtual ~ImmersiveFullscreenControllerTest() {}
+ ~ImmersiveFullscreenControllerTest() override {}
ImmersiveFullscreenController* controller() {
return controller_.get();
@@ -142,7 +140,7 @@ class ImmersiveFullscreenControllerTest : public ash::test::AshTestBase {
}
// ash::test::AshTestBase overrides:
- virtual void SetUp() override {
+ void SetUp() override {
ash::test::AshTestBase::SetUp();
widget_ = new views::Widget();
« no previous file with comments | « ash/wm/immersive_fullscreen_controller.cc ('k') | ash/wm/lock_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698