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

Unified Diff: ash/frame/caption_buttons/frame_size_button_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 873630859a2bed7b08fec9ac94bb036589e6863f..0be0b384b9ec92c05f44d2123b5e1d9521df5a17 100644
--- a/ash/frame/caption_buttons/frame_size_button_unittest.cc
+++ b/ash/frame/caption_buttons/frame_size_button_unittest.cc
@@ -31,16 +31,16 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
virtual ~TestWidgetDelegate() {}
// Overridden from views::WidgetDelegate:
- virtual views::View* GetContentsView() OVERRIDE {
+ virtual views::View* GetContentsView() override {
return this;
}
- virtual bool CanResize() const OVERRIDE {
+ virtual bool CanResize() const override {
return true;
}
- virtual bool CanMaximize() const OVERRIDE {
+ virtual bool CanMaximize() const override {
return true;
}
- virtual bool CanMinimize() const OVERRIDE {
+ virtual bool CanMinimize() const override {
return true;
}
@@ -50,7 +50,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
private:
// Overridden from views::View:
- virtual void Layout() OVERRIDE {
+ virtual void Layout() override {
caption_button_container_->Layout();
// Right align the caption button container.
@@ -60,7 +60,7 @@ class TestWidgetDelegate : public views::WidgetDelegateView {
}
virtual void ViewHierarchyChanged(
- const ViewHierarchyChangedDetails& details) OVERRIDE {
+ const ViewHierarchyChangedDetails& details) override {
if (details.is_add && details.child == this) {
caption_button_container_ = new FrameCaptionButtonContainerView(
GetWidget(), FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
@@ -125,7 +125,7 @@ class FrameSizeButtonTest : public AshTestBase {
}
// AshTestBase overrides:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
AshTestBase::SetUp();
TestWidgetDelegate* delegate = new TestWidgetDelegate();
@@ -408,14 +408,14 @@ class FrameSizeButtonTestRTL : public FrameSizeButtonTest {
FrameSizeButtonTestRTL() {}
virtual ~FrameSizeButtonTestRTL() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
original_locale_ = l10n_util::GetApplicationLocale(std::string());
base::i18n::SetICUDefaultLocale("he");
FrameSizeButtonTest::SetUp();
}
- virtual void TearDown() OVERRIDE {
+ virtual 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