| Index: cc/layers/layer_impl_unittest.cc
|
| diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
|
| index 3f5ff5e21a51a0cafb1881739ea296524b24a248..8d120bef621d19b9f40f424451858278f6ed743b 100644
|
| --- a/cc/layers/layer_impl_unittest.cc
|
| +++ b/cc/layers/layer_impl_unittest.cc
|
| @@ -497,12 +497,11 @@ TEST_F(LayerImplScrollTest, ScrollByWithNonZeroOffset) {
|
|
|
| class ScrollDelegateIgnore : public LayerImpl::ScrollOffsetDelegate {
|
| public:
|
| - virtual void SetTotalScrollOffset(
|
| - const gfx::ScrollOffset& new_value) override {}
|
| - virtual gfx::ScrollOffset GetTotalScrollOffset() override {
|
| + void SetTotalScrollOffset(const gfx::ScrollOffset& new_value) override {}
|
| + gfx::ScrollOffset GetTotalScrollOffset() override {
|
| return gfx::ScrollOffset(fixed_offset_);
|
| }
|
| - virtual bool IsExternalFlingActive() const override { return false; }
|
| + bool IsExternalFlingActive() const override { return false; }
|
|
|
| void set_fixed_offset(const gfx::Vector2dF& fixed_offset) {
|
| fixed_offset_ = fixed_offset;
|
| @@ -547,14 +546,11 @@ TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) {
|
|
|
| class ScrollDelegateAccept : public LayerImpl::ScrollOffsetDelegate {
|
| public:
|
| - virtual void SetTotalScrollOffset(
|
| - const gfx::ScrollOffset& new_value) override {
|
| + void SetTotalScrollOffset(const gfx::ScrollOffset& new_value) override {
|
| current_offset_ = new_value;
|
| }
|
| - virtual gfx::ScrollOffset GetTotalScrollOffset() override {
|
| - return current_offset_;
|
| - }
|
| - virtual bool IsExternalFlingActive() const override { return false; }
|
| + gfx::ScrollOffset GetTotalScrollOffset() override { return current_offset_; }
|
| + bool IsExternalFlingActive() const override { return false; }
|
|
|
| private:
|
| gfx::ScrollOffset current_offset_;
|
|
|