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: ash/frame/caption_buttons/frame_size_button_unittest.cc

Issue 683593003: 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/frame/caption_buttons/frame_size_button.h ('k') | ash/frame/custom_frame_view_ash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/caption_buttons/frame_size_button_unittest.cc
diff --git a/ash/frame/caption_buttons/frame_size_button_unittest.cc b/ash/frame/caption_buttons/frame_size_button_unittest.cc
index 578250817a6c26a2365c72bcc80499ab1195c38d..0df79cb42209d4cfb37ccb3c24fdbeb5ed1f2111 100644
--- a/ash/frame/caption_buttons/frame_size_button_unittest.cc
+++ b/ash/frame/caption_buttons/frame_size_button_unittest.cc
@@ -28,21 +28,13 @@ namespace {
class TestWidgetDelegate : public views::WidgetDelegateView {
public:
TestWidgetDelegate() {}
- virtual ~TestWidgetDelegate() {}
+ ~TestWidgetDelegate() override {}
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() override {
- return this;
- }
- virtual bool CanResize() const override {
- return true;
- }
- virtual bool CanMaximize() const override {
- return true;
- }
- virtual bool CanMinimize() const override {
- return true;
- }
+ views::View* GetContentsView() override { return this; }
+ bool CanResize() const override { return true; }
+ bool CanMaximize() const override { return true; }
+ bool CanMinimize() const override { return true; }
ash::FrameCaptionButtonContainerView* caption_button_container() {
return caption_button_container_;
@@ -50,7 +42,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
private:
// Overridden from views::View:
- virtual void Layout() override {
+ void Layout() override {
caption_button_container_->Layout();
// Right align the caption button container.
@@ -59,7 +51,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
preferred_size.width(), preferred_size.height());
}
- virtual void ViewHierarchyChanged(
+ void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) override {
if (details.is_add && details.child == this) {
caption_button_container_ =
@@ -91,7 +83,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
class FrameSizeButtonTest : public AshTestBase {
public:
FrameSizeButtonTest() {}
- virtual ~FrameSizeButtonTest() {}
+ ~FrameSizeButtonTest() override {}
// Returns the center point of |view| in screen coordinates.
gfx::Point CenterPointInScreen(views::View* view) {
@@ -125,7 +117,7 @@ class FrameSizeButtonTest : public AshTestBase {
}
// AshTestBase overrides:
- virtual void SetUp() override {
+ void SetUp() override {
AshTestBase::SetUp();
TestWidgetDelegate* delegate = new TestWidgetDelegate();
@@ -406,16 +398,16 @@ TEST_F(FrameSizeButtonTest, SizeButtonPressedWhenSnapButtonHovered) {
class FrameSizeButtonTestRTL : public FrameSizeButtonTest {
public:
FrameSizeButtonTestRTL() {}
- virtual ~FrameSizeButtonTestRTL() {}
+ ~FrameSizeButtonTestRTL() override {}
- virtual void SetUp() override {
+ void SetUp() override {
original_locale_ = l10n_util::GetApplicationLocale(std::string());
base::i18n::SetICUDefaultLocale("he");
FrameSizeButtonTest::SetUp();
}
- virtual void TearDown() override {
+ void TearDown() override {
FrameSizeButtonTest::TearDown();
base::i18n::SetICUDefaultLocale(original_locale_);
}
« no previous file with comments | « ash/frame/caption_buttons/frame_size_button.h ('k') | ash/frame/custom_frame_view_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698