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

Side by Side Diff: chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc

Issue 854053002: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h" 5 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 8
9 namespace chromeos { 9 namespace chromeos {
10 10
11 class TestableAccessibilityFocusRingController 11 class TestableAccessibilityFocusRingController
12 : public AccessibilityFocusRingController { 12 : public AccessibilityFocusRingController {
13 public: 13 public:
14 TestableAccessibilityFocusRingController() { 14 TestableAccessibilityFocusRingController() {
15 // By default use an easy round number for testing. 15 // By default use an easy round number for testing.
16 margin_ = 10; 16 margin_ = 10;
17 } 17 }
18 virtual ~TestableAccessibilityFocusRingController() {} 18 ~TestableAccessibilityFocusRingController() override {}
19 19
20 void RectsToRings(const std::vector<gfx::Rect>& rects, 20 void RectsToRings(const std::vector<gfx::Rect>& rects,
21 std::vector<AccessibilityFocusRing>* rings) const { 21 std::vector<AccessibilityFocusRing>* rings) const {
22 AccessibilityFocusRingController::RectsToRings(rects, rings); 22 AccessibilityFocusRingController::RectsToRings(rects, rings);
23 } 23 }
24 24
25 virtual int GetMargin() const override { 25 int GetMargin() const override { return margin_; }
26 return margin_;
27 }
28 26
29 private: 27 private:
30 int margin_; 28 int margin_;
31 }; 29 };
32 30
33 class AccessibilityFocusRingControllerTest : public testing::Test { 31 class AccessibilityFocusRingControllerTest : public testing::Test {
34 public: 32 public:
35 AccessibilityFocusRingControllerTest() {} 33 AccessibilityFocusRingControllerTest() {}
36 virtual ~AccessibilityFocusRingControllerTest() {} 34 ~AccessibilityFocusRingControllerTest() override {}
37 35
38 protected: 36 protected:
39 gfx::Rect AddMargin(gfx::Rect r) { 37 gfx::Rect AddMargin(gfx::Rect r) {
40 r.Inset(-controller_.GetMargin(), -controller_.GetMargin()); 38 r.Inset(-controller_.GetMargin(), -controller_.GetMargin());
41 return r; 39 return r;
42 } 40 }
43 41
44 TestableAccessibilityFocusRingController controller_; 42 TestableAccessibilityFocusRingController controller_;
45 }; 43 };
46 44
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 EXPECT_EQ(gfx::Point(0, 400), points[29]); 122 EXPECT_EQ(gfx::Point(0, 400), points[29]);
125 EXPECT_EQ(gfx::Point(0, 390), points[30]); 123 EXPECT_EQ(gfx::Point(0, 390), points[30]);
126 EXPECT_EQ(gfx::Point(0, 110), points[31]); 124 EXPECT_EQ(gfx::Point(0, 110), points[31]);
127 EXPECT_EQ(gfx::Point(0, 100), points[32]); 125 EXPECT_EQ(gfx::Point(0, 100), points[32]);
128 EXPECT_EQ(gfx::Point(0, 100), points[33]); 126 EXPECT_EQ(gfx::Point(0, 100), points[33]);
129 EXPECT_EQ(gfx::Point(0, 100), points[34]); 127 EXPECT_EQ(gfx::Point(0, 100), points[34]);
130 EXPECT_EQ(gfx::Point(0, 100), points[35]); 128 EXPECT_EQ(gfx::Point(0, 100), points[35]);
131 } 129 }
132 130
133 } // namespace chromeos 131 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698