| Index: ui/views/controls/scrollbar/scrollbar_unittest.cc
|
| diff --git a/ui/views/controls/scrollbar/scrollbar_unittest.cc b/ui/views/controls/scrollbar/scrollbar_unittest.cc
|
| index 295ac2c3cc97df233abcb9e17be3e886980b42eb..9318c5642e520cf864934547fab51cfa38587ec2 100644
|
| --- a/ui/views/controls/scrollbar/scrollbar_unittest.cc
|
| +++ b/ui/views/controls/scrollbar/scrollbar_unittest.cc
|
| @@ -16,15 +16,14 @@ class TestScrollBarController : public views::ScrollBarController {
|
| public:
|
| virtual ~TestScrollBarController() {}
|
|
|
| - virtual void ScrollToPosition(views::ScrollBar* source,
|
| - int position) override {
|
| + void ScrollToPosition(views::ScrollBar* source, int position) override {
|
| last_source = source;
|
| last_position = position;
|
| }
|
|
|
| - virtual int GetScrollIncrement(views::ScrollBar* source,
|
| - bool is_page,
|
| - bool is_positive) override {
|
| + int GetScrollIncrement(views::ScrollBar* source,
|
| + bool is_page,
|
| + bool is_positive) override {
|
| last_source = source;
|
| last_is_page = is_page;
|
| last_is_positive = is_positive;
|
| @@ -50,7 +49,7 @@ class NativeScrollBarTest : public ViewsTestBase {
|
| public:
|
| NativeScrollBarTest() : widget_(NULL), scrollbar_(NULL) {}
|
|
|
| - virtual void SetUp() {
|
| + void SetUp() override {
|
| ViewsTestBase::SetUp();
|
| controller_.reset(new TestScrollBarController());
|
|
|
| @@ -75,7 +74,7 @@ class NativeScrollBarTest : public ViewsTestBase {
|
| track_size_ = scrollbar_->GetTrackBounds().width();
|
| }
|
|
|
| - virtual void TearDown() {
|
| + void TearDown() override {
|
| widget_->Close();
|
| ViewsTestBase::TearDown();
|
| }
|
|
|