Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Unified Diff: ui/views/controls/scrollbar/cocoa_scroll_bar.h

Issue 2189583004: [not for review - epic CL] Adding Elastic+Momentum+Layered scrolling to views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/scrollbar/base_scroll_bar.cc ('k') | ui/views/controls/scrollbar/cocoa_scroll_bar.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..35043a1398612ba6276d64991696b18e6937d281 100644
--- a/ui/views/controls/scrollbar/cocoa_scroll_bar.h
+++ b/ui/views/controls/scrollbar/cocoa_scroll_bar.h
@@ -26,8 +26,10 @@ 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;
// ViewsScrollbarBridgeDelegate:
void OnScrollerStyleChanged() override;
@@ -100,6 +102,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.
+ int last_contents_scroll_offset_;
+
// True when the scrollbar is expanded.
bool is_expanded_;
« no previous file with comments | « ui/views/controls/scrollbar/base_scroll_bar.cc ('k') | ui/views/controls/scrollbar/cocoa_scroll_bar.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698