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

Side by Side Diff: ash/wm/panels/panel_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/panels/panel_window_resizer.h ('k') | ash/wm/partial_screenshot_view.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/panels/panel_window_resizer.h" 5 #include "ash/wm/panels/panel_window_resizer.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf.h" 8 #include "ash/shelf/shelf.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shelf/shelf_model.h" 10 #include "ash/shelf/shelf_model.h"
(...skipping 19 matching lines...) Expand all
30 #include "ui/views/widget/widget.h" 30 #include "ui/views/widget/widget.h"
31 #include "ui/wm/core/window_util.h" 31 #include "ui/wm/core/window_util.h"
32 32
33 namespace ash { 33 namespace ash {
34 34
35 class PanelWindowResizerTest : public test::AshTestBase { 35 class PanelWindowResizerTest : public test::AshTestBase {
36 public: 36 public:
37 PanelWindowResizerTest() {} 37 PanelWindowResizerTest() {}
38 virtual ~PanelWindowResizerTest() {} 38 virtual ~PanelWindowResizerTest() {}
39 39
40 virtual void SetUp() OVERRIDE { 40 virtual void SetUp() override {
41 AshTestBase::SetUp(); 41 AshTestBase::SetUp();
42 UpdateDisplay("600x400"); 42 UpdateDisplay("600x400");
43 test::ShellTestApi test_api(Shell::GetInstance()); 43 test::ShellTestApi test_api(Shell::GetInstance());
44 model_ = test_api.shelf_model(); 44 model_ = test_api.shelf_model();
45 shelf_delegate_ = test::TestShelfDelegate::instance(); 45 shelf_delegate_ = test::TestShelfDelegate::instance();
46 } 46 }
47 47
48 virtual void TearDown() OVERRIDE { 48 virtual void TearDown() override {
49 AshTestBase::TearDown(); 49 AshTestBase::TearDown();
50 } 50 }
51 51
52 protected: 52 protected:
53 gfx::Point CalculateDragPoint(const WindowResizer& resizer, 53 gfx::Point CalculateDragPoint(const WindowResizer& resizer,
54 int delta_x, 54 int delta_x,
55 int delta_y) const { 55 int delta_y) const {
56 gfx::Point location = resizer.GetInitialLocation(); 56 gfx::Point location = resizer.GetInitialLocation();
57 location.set_x(location.x() + delta_x); 57 location.set_x(location.x() + delta_x);
58 location.set_y(location.y() + delta_y); 58 location.set_y(location.y() + delta_y);
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 DISALLOW_COPY_AND_ASSIGN(PanelWindowResizerTest); 184 DISALLOW_COPY_AND_ASSIGN(PanelWindowResizerTest);
185 }; 185 };
186 186
187 class PanelWindowResizerTextDirectionTest 187 class PanelWindowResizerTextDirectionTest
188 : public PanelWindowResizerTest, 188 : public PanelWindowResizerTest,
189 public testing::WithParamInterface<bool> { 189 public testing::WithParamInterface<bool> {
190 public: 190 public:
191 PanelWindowResizerTextDirectionTest() : is_rtl_(GetParam()) {} 191 PanelWindowResizerTextDirectionTest() : is_rtl_(GetParam()) {}
192 virtual ~PanelWindowResizerTextDirectionTest() {} 192 virtual ~PanelWindowResizerTextDirectionTest() {}
193 193
194 virtual void SetUp() OVERRIDE { 194 virtual void SetUp() override {
195 original_locale = l10n_util::GetApplicationLocale(std::string()); 195 original_locale = l10n_util::GetApplicationLocale(std::string());
196 if (is_rtl_) 196 if (is_rtl_)
197 base::i18n::SetICUDefaultLocale("he"); 197 base::i18n::SetICUDefaultLocale("he");
198 PanelWindowResizerTest::SetUp(); 198 PanelWindowResizerTest::SetUp();
199 ASSERT_EQ(is_rtl_, base::i18n::IsRTL()); 199 ASSERT_EQ(is_rtl_, base::i18n::IsRTL());
200 } 200 }
201 201
202 virtual void TearDown() OVERRIDE { 202 virtual void TearDown() override {
203 if (is_rtl_) 203 if (is_rtl_)
204 base::i18n::SetICUDefaultLocale(original_locale); 204 base::i18n::SetICUDefaultLocale(original_locale);
205 PanelWindowResizerTest::TearDown(); 205 PanelWindowResizerTest::TearDown();
206 } 206 }
207 207
208 private: 208 private:
209 bool is_rtl_; 209 bool is_rtl_;
210 std::string original_locale; 210 std::string original_locale;
211 211
212 DISALLOW_COPY_AND_ASSIGN(PanelWindowResizerTextDirectionTest); 212 DISALLOW_COPY_AND_ASSIGN(PanelWindowResizerTextDirectionTest);
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 586
587 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest, 587 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest,
588 testing::Bool()); 588 testing::Bool());
589 INSTANTIATE_TEST_CASE_P(NormalPanelPopup, 589 INSTANTIATE_TEST_CASE_P(NormalPanelPopup,
590 PanelWindowResizerTransientTest, 590 PanelWindowResizerTransientTest,
591 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, 591 testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
592 ui::wm::WINDOW_TYPE_PANEL, 592 ui::wm::WINDOW_TYPE_PANEL,
593 ui::wm::WINDOW_TYPE_POPUP)); 593 ui::wm::WINDOW_TYPE_POPUP));
594 594
595 } // namespace ash 595 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/panels/panel_window_resizer.h ('k') | ash/wm/partial_screenshot_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698