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

Unified Diff: ui/views/examples/scroll_view_example.h

Issue 2194833002: Overscroll and Elasticity for views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@20160728-MacViews-RouteThroughInputHandler
Patch Set: Restore functionality and fix bugs \o/ Created 4 years, 1 month 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
Index: ui/views/examples/scroll_view_example.h
diff --git a/ui/views/examples/scroll_view_example.h b/ui/views/examples/scroll_view_example.h
index ce2111032e4145f3c7650eb4c93e72b3c9cf97ee..b228a800b2a5df071d1f8c82cd848f01fd9705e7 100644
--- a/ui/views/examples/scroll_view_example.h
+++ b/ui/views/examples/scroll_view_example.h
@@ -28,6 +28,9 @@ class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase,
void CreateExampleView(View* container) override;
private:
+ void CreateScrollable();
+ void CreateNestedScrolls();
+
// ButtonListener:
void ButtonPressed(Button* sender, const ui::Event& event) override;
@@ -38,6 +41,7 @@ class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase,
LabelButton* big_square_;
LabelButton* small_square_;
LabelButton* scroll_to_;
+ LabelButton* nested_;
class ScrollableView;
// The content of the scroll view.
@@ -46,6 +50,8 @@ class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase,
// The scroll view to test.
ScrollView* scroll_view_;
+ View* nested_scrolls_;
+
DISALLOW_COPY_AND_ASSIGN(ScrollViewExample);
};
« no previous file with comments | « ui/events/blink/input_scroll_elasticity_controller_unittest.cc ('k') | ui/views/examples/scroll_view_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698