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

Unified Diff: ash/system/chromeos/screen_security/screen_tray_item_unittest.cc

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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: ash/system/chromeos/screen_security/screen_tray_item_unittest.cc
diff --git a/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc b/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc
index fcfcd7d0837e15ea1c41df681a17463e839b502d..9c68d0b851466bfc17462c6a6e52ac929c2a37d7 100644
--- a/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc
+++ b/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc
@@ -46,14 +46,14 @@ class ScreenTrayItemTest : public ash::test::AshTestBase {
public:
ScreenTrayItemTest()
: tray_item_(NULL), stop_callback_hit_count_(0) {}
- virtual ~ScreenTrayItemTest() {}
+ ~ScreenTrayItemTest() override {}
ScreenTrayItem* tray_item() { return tray_item_; }
void set_tray_item(ScreenTrayItem* tray_item) { tray_item_ = tray_item; }
int stop_callback_hit_count() const { return stop_callback_hit_count_; }
- virtual void SetUp() override {
+ void SetUp() override {
test::AshTestBase::SetUp();
TrayItemView::DisableAnimationsForTest();
}
@@ -81,9 +81,9 @@ class ScreenTrayItemTest : public ash::test::AshTestBase {
class ScreenCaptureTest : public ScreenTrayItemTest {
public:
ScreenCaptureTest() {}
- virtual ~ScreenCaptureTest() {}
+ ~ScreenCaptureTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
ScreenTrayItemTest::SetUp();
// This tray item is owned by its parent system tray view and will
// be deleted automatically when its parent is destroyed in AshTestBase.
@@ -98,9 +98,9 @@ class ScreenCaptureTest : public ScreenTrayItemTest {
class ScreenShareTest : public ScreenTrayItemTest {
public:
ScreenShareTest() {}
- virtual ~ScreenShareTest() {}
+ ~ScreenShareTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
ScreenTrayItemTest::SetUp();
// This tray item is owned by its parent system tray view and will
// be deleted automatically when its parent is destroyed in AshTestBase.

Powered by Google App Engine
This is Rietveld 408576698