| 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);
|
| };
|
|
|
|
|