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

Side by Side Diff: ash/wm/dock/docked_window_resizer_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 unified diff | Download patch
« no previous file with comments | « ash/wm/dock/docked_window_resizer.h ('k') | ash/wm/drag_window_resizer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/dock/docked_window_resizer.h" 5 #include "ash/wm/dock/docked_window_resizer.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/screen_util.h" 9 #include "ash/screen_util.h"
10 #include "ash/shelf/shelf.h" 10 #include "ash/shelf/shelf.h"
(...skipping 27 matching lines...) Expand all
38 38
39 namespace ash { 39 namespace ash {
40 40
41 class DockedWindowResizerTest 41 class DockedWindowResizerTest
42 : public test::AshTestBase, 42 : public test::AshTestBase,
43 public testing::WithParamInterface<ui::wm::WindowType> { 43 public testing::WithParamInterface<ui::wm::WindowType> {
44 public: 44 public:
45 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} 45 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {}
46 virtual ~DockedWindowResizerTest() {} 46 virtual ~DockedWindowResizerTest() {}
47 47
48 virtual void SetUp() OVERRIDE { 48 virtual void SetUp() override {
49 AshTestBase::SetUp(); 49 AshTestBase::SetUp();
50 UpdateDisplay("600x400"); 50 UpdateDisplay("600x400");
51 test::ShellTestApi test_api(Shell::GetInstance()); 51 test::ShellTestApi test_api(Shell::GetInstance());
52 model_ = test_api.shelf_model(); 52 model_ = test_api.shelf_model();
53 } 53 }
54 54
55 virtual void TearDown() OVERRIDE { 55 virtual void TearDown() override {
56 AshTestBase::TearDown(); 56 AshTestBase::TearDown();
57 } 57 }
58 58
59 protected: 59 protected:
60 enum DockedEdge { 60 enum DockedEdge {
61 DOCKED_EDGE_NONE, 61 DOCKED_EDGE_NONE,
62 DOCKED_EDGE_LEFT, 62 DOCKED_EDGE_LEFT,
63 DOCKED_EDGE_RIGHT, 63 DOCKED_EDGE_RIGHT,
64 }; 64 };
65 65
(...skipping 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after
1604 EXPECT_TRUE(window_state->IsMaximized()); 1604 EXPECT_TRUE(window_state->IsMaximized());
1605 } 1605 }
1606 1606
1607 // Tests run twice - on both panels and normal windows 1607 // Tests run twice - on both panels and normal windows
1608 INSTANTIATE_TEST_CASE_P(NormalOrPanel, 1608 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
1609 DockedWindowResizerTest, 1609 DockedWindowResizerTest,
1610 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, 1610 testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
1611 ui::wm::WINDOW_TYPE_PANEL)); 1611 ui::wm::WINDOW_TYPE_PANEL));
1612 1612
1613 } // namespace ash 1613 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/dock/docked_window_resizer.h ('k') | ash/wm/drag_window_resizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698