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

Unified Diff: ui/app_list/pagination_model_unittest.cc

Issue 667923002: Standardize usage of virtual/override/final in ui/ (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 | « ui/app_list/pagination_model.h ('k') | ui/app_list/search/dictionary_data_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/pagination_model_unittest.cc
diff --git a/ui/app_list/pagination_model_unittest.cc b/ui/app_list/pagination_model_unittest.cc
index ad437cf0d974c4ccb11fe540e8e442aca04ed5db..3c9b5a45480ba04c780bb8dad6c4e2076a2fb4c2 100644
--- a/ui/app_list/pagination_model_unittest.cc
+++ b/ui/app_list/pagination_model_unittest.cc
@@ -26,7 +26,7 @@ class TestPaginationModelObserver : public PaginationModelObserver {
transition_page_(-1) {
Reset();
}
- virtual ~TestPaginationModelObserver() {}
+ ~TestPaginationModelObserver() override {}
void Reset() {
selection_count_ = 0;
@@ -61,9 +61,8 @@ class TestPaginationModelObserver : public PaginationModelObserver {
}
// PaginationModelObserver overrides:
- virtual void TotalPagesChanged() override {}
- virtual void SelectedPageChanged(int old_selected,
- int new_selected) override {
+ void TotalPagesChanged() override {}
+ void SelectedPageChanged(int old_selected, int new_selected) override {
AppendSelectedPage(new_selected);
++selection_count_;
if (expected_page_selection_ &&
@@ -72,10 +71,9 @@ class TestPaginationModelObserver : public PaginationModelObserver {
}
}
- virtual void TransitionStarted() override {
- }
+ void TransitionStarted() override {}
- virtual void TransitionChanged() override {
+ void TransitionChanged() override {
if (transition_page_ == -1 ||
model_->transition().target_page == transition_page_) {
if (model_->transition().progress == 0)
« no previous file with comments | « ui/app_list/pagination_model.h ('k') | ui/app_list/search/dictionary_data_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698