| Index: cc/layers/layer_impl_unittest.cc
|
| diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
|
| index 2d3305c57c4add80fe5840b8fe30627a50547edf..6f6eea174942992a041844d4239bc47c7d891fd7 100644
|
| --- a/cc/layers/layer_impl_unittest.cc
|
| +++ b/cc/layers/layer_impl_unittest.cc
|
| @@ -376,7 +376,6 @@ class ScrollDelegateIgnore : public LayerScrollOffsetDelegate {
|
| virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE {
|
| return fixed_offset_;
|
| }
|
| - virtual bool IsExternalFlingActive() const OVERRIDE { return false; }
|
|
|
| void set_fixed_offset(gfx::Vector2dF fixed_offset) {
|
| fixed_offset_ = fixed_offset;
|
| @@ -433,7 +432,6 @@ class ScrollDelegateAccept : public LayerScrollOffsetDelegate {
|
| virtual gfx::Vector2dF GetTotalScrollOffset() OVERRIDE {
|
| return current_offset_;
|
| }
|
| - virtual bool IsExternalFlingActive() const OVERRIDE { return false; }
|
| virtual void SetTotalPageScaleFactor(float page_scale_factor) OVERRIDE {}
|
| virtual void SetScrollableSize(gfx::SizeF scrollable_size) OVERRIDE {}
|
|
|
|
|