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

Unified Diff: athena/home/home_card_gesture_manager_unittest.cc

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: rebase 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 | « athena/home/athena_start_page_view_unittest.cc ('k') | athena/home/home_card_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/home_card_gesture_manager_unittest.cc
diff --git a/athena/home/home_card_gesture_manager_unittest.cc b/athena/home/home_card_gesture_manager_unittest.cc
index 3769250e545087be1375675beb23a7ab8a42f2ef..c5c40fcfeebcf3a441e5623e13655bc44c3d52db 100644
--- a/athena/home/home_card_gesture_manager_unittest.cc
+++ b/athena/home/home_card_gesture_manager_unittest.cc
@@ -25,10 +25,10 @@ class HomeCardGestureManagerTest : public test::AthenaTestBase,
last_y_(0),
progress_count_(0),
end_count_(0) {}
- virtual ~HomeCardGestureManagerTest() {}
+ ~HomeCardGestureManagerTest() override {}
// testing::Test:
- virtual void SetUp() override {
+ void SetUp() override {
test::AthenaTestBase::SetUp();
gesture_manager_.reset(new HomeCardGestureManager(this, screen_bounds()));
}
@@ -96,16 +96,15 @@ class HomeCardGestureManagerTest : public test::AthenaTestBase,
}
// HomeCardGestureManager::Delegate:
- virtual void OnGestureEnded(HomeCard::State final_state,
- bool is_fling) override {
+ void OnGestureEnded(HomeCard::State final_state, bool is_fling) override {
final_state_ = final_state;
was_fling_ = is_fling;
++end_count_;
}
- virtual void OnGestureProgressed(HomeCard::State from_state,
- HomeCard::State to_state,
- float progress) override {
+ void OnGestureProgressed(HomeCard::State from_state,
+ HomeCard::State to_state,
+ float progress) override {
last_from_state_ = from_state;
last_to_state_ = to_state;
last_progress_ = progress;
« no previous file with comments | « athena/home/athena_start_page_view_unittest.cc ('k') | athena/home/home_card_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698