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

Side by Side Diff: ui/views/examples/scroll_view_example.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 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 unified diff | Download patch
« no previous file with comments | « ui/views/examples/radio_button_example.h ('k') | ui/views/examples/scroll_view_example.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "ui/views/controls/button/button.h" 11 #include "ui/views/controls/button/button.h"
12 #include "ui/views/controls/scroll_view.h" 12 #include "ui/views/controls/scroll_view.h"
13 #include "ui/views/examples/example_base.h" 13 #include "ui/views/examples/example_base.h"
14 14
15 namespace views { 15 namespace views {
16 16
17 class LabelButton; 17 class LabelButton;
18 18
19 namespace examples { 19 namespace examples {
20 20
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 virtual ~ScrollViewExample(); 25 virtual ~ScrollViewExample();
26 26
27 // ExampleBase: 27 // ExampleBase:
28 virtual void CreateExampleView(View* container) OVERRIDE; 28 virtual void CreateExampleView(View* container) override;
29 29
30 private: 30 private:
31 // ButtonListener: 31 // ButtonListener:
32 virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; 32 virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
33 33
34 // Control buttons to change the size of scrollable and jump to 34 // Control buttons to change the size of scrollable and jump to
35 // predefined position. 35 // predefined position.
36 LabelButton* wide_; 36 LabelButton* wide_;
37 LabelButton* tall_; 37 LabelButton* tall_;
38 LabelButton* big_square_; 38 LabelButton* big_square_;
39 LabelButton* small_square_; 39 LabelButton* small_square_;
40 LabelButton* scroll_to_; 40 LabelButton* scroll_to_;
41 41
42 class ScrollableView; 42 class ScrollableView;
43 // The content of the scroll view. 43 // The content of the scroll view.
44 ScrollableView* scrollable_; 44 ScrollableView* scrollable_;
45 45
46 // The scroll view to test. 46 // The scroll view to test.
47 ScrollView* scroll_view_; 47 ScrollView* scroll_view_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(ScrollViewExample); 49 DISALLOW_COPY_AND_ASSIGN(ScrollViewExample);
50 }; 50 };
51 51
52 } // namespace examples 52 } // namespace examples
53 } // namespace views 53 } // namespace views
54 54
55 #endif // UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_ 55 #endif // UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
OLDNEW
« no previous file with comments | « ui/views/examples/radio_button_example.h ('k') | ui/views/examples/scroll_view_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698