| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index 948c2bae3204342669eec1748c24ff0e0bdabd5f..161b36160b8d2963075db0839fe317ca3c91699f 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -50,16 +50,16 @@ class LayerScrollOffsetDelegateProxy : public LayerImpl::ScrollOffsetDelegate {
|
|
|
| // LayerScrollOffsetDelegate implementation.
|
| virtual void SetTotalScrollOffset(
|
| - const gfx::ScrollOffset& new_offset) OVERRIDE {
|
| + const gfx::ScrollOffset& new_offset) override {
|
| last_set_scroll_offset_ = new_offset;
|
| layer_tree_impl_->UpdateScrollOffsetDelegate();
|
| }
|
|
|
| - virtual gfx::ScrollOffset GetTotalScrollOffset() OVERRIDE {
|
| + virtual gfx::ScrollOffset GetTotalScrollOffset() override {
|
| return layer_tree_impl_->GetDelegatedScrollOffset(layer_);
|
| }
|
|
|
| - virtual bool IsExternalFlingActive() const OVERRIDE {
|
| + virtual bool IsExternalFlingActive() const override {
|
| return delegate_->IsExternalFlingActive();
|
| }
|
|
|
|
|