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

Unified Diff: ui/app_list/views/apps_grid_view_unittest.cc

Issue 681873002: 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 | « ui/app_list/views/apps_grid_view.cc ('k') | ui/app_list/views/cached_label.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/apps_grid_view_unittest.cc
diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc
index 144095f71df8bcc09e414ae88b29258565a0876a..544496c9209b36e7d32bb77ac85abd63eb70647f 100644
--- a/ui/app_list/views/apps_grid_view_unittest.cc
+++ b/ui/app_list/views/apps_grid_view_unittest.cc
@@ -45,9 +45,7 @@ class PageFlipWaiter : public PaginationModelObserver {
model_->AddObserver(this);
}
- virtual ~PageFlipWaiter() {
- model_->RemoveObserver(this);
- }
+ ~PageFlipWaiter() override { model_->RemoveObserver(this); }
void Wait() {
DCHECK(!wait_);
@@ -63,10 +61,8 @@ class PageFlipWaiter : public PaginationModelObserver {
private:
// 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 {
if (!selected_pages_.empty())
selected_pages_ += ',';
selected_pages_ += base::IntToString(new_selected);
@@ -74,10 +70,8 @@ class PageFlipWaiter : public PaginationModelObserver {
if (wait_)
ui_loop_->Quit();
}
- virtual void TransitionStarted() override {
- }
- virtual void TransitionChanged() override {
- }
+ void TransitionStarted() override {}
+ void TransitionChanged() override {}
base::MessageLoopForUI* ui_loop_;
PaginationModel* model_;
@@ -92,10 +86,10 @@ class PageFlipWaiter : public PaginationModelObserver {
class AppsGridViewTest : public views::ViewsTestBase {
public:
AppsGridViewTest() {}
- virtual ~AppsGridViewTest() {}
+ ~AppsGridViewTest() override {}
// testing::Test overrides:
- virtual void SetUp() override {
+ void SetUp() override {
views::ViewsTestBase::SetUp();
model_.reset(new AppListTestModel);
model_->SetFoldersEnabled(true);
@@ -108,7 +102,7 @@ class AppsGridViewTest : public views::ViewsTestBase {
test_api_.reset(new AppsGridViewTestApi(apps_grid_view_.get()));
}
- virtual void TearDown() override {
+ void TearDown() override {
apps_grid_view_.reset(); // Release apps grid view before models.
views::ViewsTestBase::TearDown();
}
@@ -186,33 +180,30 @@ class AppsGridViewTest : public views::ViewsTestBase {
class TestAppsGridViewFolderDelegate : public AppsGridViewFolderDelegate {
public:
TestAppsGridViewFolderDelegate() : show_bubble_(false) {}
- virtual ~TestAppsGridViewFolderDelegate() {}
+ ~TestAppsGridViewFolderDelegate() override {}
// Overridden from AppsGridViewFolderDelegate:
- virtual void UpdateFolderViewBackground(bool show_bubble) override {
+ void UpdateFolderViewBackground(bool show_bubble) override {
show_bubble_ = show_bubble;
}
- virtual void ReparentItem(AppListItemView* original_drag_view,
- const gfx::Point& drag_point_in_folder_grid)
- override {}
+ void ReparentItem(AppListItemView* original_drag_view,
+ const gfx::Point& drag_point_in_folder_grid) override {}
- virtual void DispatchDragEventForReparent(
+ void DispatchDragEventForReparent(
AppsGridView::Pointer pointer,
const gfx::Point& drag_point_in_folder_grid) override {}
- virtual void DispatchEndDragEventForReparent(
- bool events_forwarded_to_drag_drop_host,
- bool cancel_drag) override {}
+ void DispatchEndDragEventForReparent(bool events_forwarded_to_drag_drop_host,
+ bool cancel_drag) override {}
- virtual bool IsPointOutsideOfFolderBoundary(const gfx::Point& point)
- override {
+ bool IsPointOutsideOfFolderBoundary(const gfx::Point& point) override {
return false;
}
- virtual bool IsOEMFolder() const override { return false; }
+ bool IsOEMFolder() const override { return false; }
- virtual void SetRootLevelDragViewVisible(bool visible) override {}
+ void SetRootLevelDragViewVisible(bool visible) override {}
bool show_bubble() { return show_bubble_; }
« no previous file with comments | « ui/app_list/views/apps_grid_view.cc ('k') | ui/app_list/views/cached_label.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698