Chromium Code Reviews| Index: ui/views/controls/scrollbar/cocoa_scroll_bar.h |
| diff --git a/ui/views/controls/scrollbar/cocoa_scroll_bar.h b/ui/views/controls/scrollbar/cocoa_scroll_bar.h |
| index 2cca52a6e380aa0400baf2b0c70ec5152762b9eb..86295ec04ed8694c119de0d38907d31dca3541f4 100644 |
| --- a/ui/views/controls/scrollbar/cocoa_scroll_bar.h |
| +++ b/ui/views/controls/scrollbar/cocoa_scroll_bar.h |
| @@ -26,8 +26,11 @@ class VIEWS_EXPORT CocoaScrollBar : public BaseScrollBar, |
| explicit CocoaScrollBar(bool horizontal); |
| ~CocoaScrollBar() override; |
| - // BaseScrollBar: |
| - void ScrollToPosition(int position) override; |
| + // ScrollBar: |
| + void Update(int viewport_size, |
| + int content_size, |
| + int contents_scroll_offset) override; |
| + void ObserveScrollEvent(const ui::ScrollEvent& event) override; |
| // ViewsScrollbarBridgeDelegate: |
| void OnScrollerStyleChanged() override; |
| @@ -65,6 +68,8 @@ class VIEWS_EXPORT CocoaScrollBar : public BaseScrollBar, |
| void OnPaint(gfx::Canvas* canvas) override; |
| private: |
| + friend class BaseScrollBar; // For BaseScrollBar::GetHideTimerForTest(). |
| + |
| // Methods to change the visibility of the scrollbar. |
| void ShowScrollbar(); |
| void HideScrollbar(); |
| @@ -100,6 +105,9 @@ class VIEWS_EXPORT CocoaScrollBar : public BaseScrollBar, |
| // the scrollbar as the hiding animation. |
| gfx::SlideAnimation thickness_animation_; |
| + // The scroll offset from the last adjustment to the scroll bar. |
|
spqchan
2016/11/14 23:27:58
"scroll bar" -> "scrollbar
tapted
2016/11/15 12:22:23
Done.
|
| + int last_contents_scroll_offset_; |
| + |
| // True when the scrollbar is expanded. |
| bool is_expanded_; |