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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_ 5 #ifndef UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
6 #define UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_ 6 #define UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 10 matching lines...) Expand all
21 class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase, 21 class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase,
22 public ButtonListener { 22 public ButtonListener {
23 public: 23 public:
24 ScrollViewExample(); 24 ScrollViewExample();
25 ~ScrollViewExample() override; 25 ~ScrollViewExample() override;
26 26
27 // ExampleBase: 27 // ExampleBase:
28 void CreateExampleView(View* container) override; 28 void CreateExampleView(View* container) override;
29 29
30 private: 30 private:
31 void CreateScrollable();
32 void CreateNestedScrolls();
33
31 // ButtonListener: 34 // ButtonListener:
32 void ButtonPressed(Button* sender, const ui::Event& event) override; 35 void ButtonPressed(Button* sender, const ui::Event& event) override;
33 36
34 // Control buttons to change the size of scrollable and jump to 37 // Control buttons to change the size of scrollable and jump to
35 // predefined position. 38 // predefined position.
36 LabelButton* wide_; 39 LabelButton* wide_;
37 LabelButton* tall_; 40 LabelButton* tall_;
38 LabelButton* big_square_; 41 LabelButton* big_square_;
39 LabelButton* small_square_; 42 LabelButton* small_square_;
40 LabelButton* scroll_to_; 43 LabelButton* scroll_to_;
44 LabelButton* nested_;
41 45
42 class ScrollableView; 46 class ScrollableView;
43 // The content of the scroll view. 47 // The content of the scroll view.
44 ScrollableView* scrollable_; 48 ScrollableView* scrollable_;
45 49
46 // The scroll view to test. 50 // The scroll view to test.
47 ScrollView* scroll_view_; 51 ScrollView* scroll_view_;
48 52
53 View* nested_scrolls_;
54
49 DISALLOW_COPY_AND_ASSIGN(ScrollViewExample); 55 DISALLOW_COPY_AND_ASSIGN(ScrollViewExample);
50 }; 56 };
51 57
52 } // namespace examples 58 } // namespace examples
53 } // namespace views 59 } // namespace views
54 60
55 #endif // UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_ 61 #endif // UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
OLDNEW
« 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