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

Unified Diff: ash/wm/workspace/workspace_window_resizer_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: Workaround 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
« no previous file with comments | « ash/wm/power_button_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 263eb0e5e4d1b6dcc50b57c8af34e237f81dd2d9..6f5c9a72ed66448172f8f1b58063ad60bea1a9ba 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -39,7 +39,7 @@ class TestWindowDelegate : public aura::test::TestWindowDelegate {
public:
TestWindowDelegate() {
}
- virtual ~TestWindowDelegate() {}
+ ~TestWindowDelegate() override {}
void set_min_size(const gfx::Size& size) {
min_size_ = size;
@@ -51,13 +51,9 @@ class TestWindowDelegate : public aura::test::TestWindowDelegate {
private:
// Overridden from aura::Test::TestWindowDelegate:
- virtual gfx::Size GetMinimumSize() const override {
- return min_size_;
- }
+ gfx::Size GetMinimumSize() const override { return min_size_; }
- virtual gfx::Size GetMaximumSize() const override {
- return max_size_;
- }
+ gfx::Size GetMaximumSize() const override { return max_size_; }
gfx::Size min_size_;
gfx::Size max_size_;
@@ -70,9 +66,9 @@ class TestWindowDelegate : public aura::test::TestWindowDelegate {
class WorkspaceWindowResizerTest : public test::AshTestBase {
public:
WorkspaceWindowResizerTest() : workspace_resizer_(NULL) {}
- virtual ~WorkspaceWindowResizerTest() {}
+ ~WorkspaceWindowResizerTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
AshTestBase::SetUp();
UpdateDisplay(base::StringPrintf("800x%d", kRootHeight));
// Ignore the touch slop region.
@@ -113,7 +109,7 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
window4_->set_id(4);
}
- virtual void TearDown() override {
+ void TearDown() override {
window_.reset();
window2_.reset();
window3_.reset();
« no previous file with comments | « ash/wm/power_button_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698