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

Side by Side Diff: ui/views/examples/combobox_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/checkbox_example.h ('k') | ui/views/examples/double_split_view_example.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_COMBOBOX_EXAMPLE_H_ 5 #ifndef UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
6 #define UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_ 6 #define UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/base/models/combobox_model.h" 9 #include "ui/base/models/combobox_model.h"
10 #include "ui/views/controls/combobox/combobox_listener.h" 10 #include "ui/views/controls/combobox/combobox_listener.h"
11 #include "ui/views/examples/example_base.h" 11 #include "ui/views/examples/example_base.h"
12 12
13 namespace views { 13 namespace views {
14 namespace examples { 14 namespace examples {
15 15
16 // A combobox model implementation that generates a list of "Item <index>". 16 // A combobox model implementation that generates a list of "Item <index>".
17 class VIEWS_EXAMPLES_EXPORT ComboboxModelExample : public ui::ComboboxModel { 17 class VIEWS_EXAMPLES_EXPORT ComboboxModelExample : public ui::ComboboxModel {
18 public: 18 public:
19 ComboboxModelExample(); 19 ComboboxModelExample();
20 virtual ~ComboboxModelExample(); 20 virtual ~ComboboxModelExample();
21 21
22 // ui::ComboboxModel: 22 // ui::ComboboxModel:
23 virtual int GetItemCount() const OVERRIDE; 23 virtual int GetItemCount() const override;
24 virtual base::string16 GetItemAt(int index) OVERRIDE; 24 virtual base::string16 GetItemAt(int index) override;
25 25
26 private: 26 private:
27 DISALLOW_COPY_AND_ASSIGN(ComboboxModelExample); 27 DISALLOW_COPY_AND_ASSIGN(ComboboxModelExample);
28 }; 28 };
29 29
30 class VIEWS_EXAMPLES_EXPORT ComboboxExample : public ExampleBase, 30 class VIEWS_EXAMPLES_EXPORT ComboboxExample : public ExampleBase,
31 public ComboboxListener { 31 public ComboboxListener {
32 public: 32 public:
33 ComboboxExample(); 33 ComboboxExample();
34 virtual ~ComboboxExample(); 34 virtual ~ComboboxExample();
35 35
36 // ExampleBase: 36 // ExampleBase:
37 virtual void CreateExampleView(View* container) OVERRIDE; 37 virtual void CreateExampleView(View* container) override;
38 38
39 private: 39 private:
40 // ComboboxListener: 40 // ComboboxListener:
41 virtual void OnPerformAction(Combobox* combobox) OVERRIDE; 41 virtual void OnPerformAction(Combobox* combobox) override;
42 42
43 ComboboxModelExample combobox_model_; 43 ComboboxModelExample combobox_model_;
44 Combobox* combobox_; 44 Combobox* combobox_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(ComboboxExample); 46 DISALLOW_COPY_AND_ASSIGN(ComboboxExample);
47 }; 47 };
48 48
49 } // namespace examples 49 } // namespace examples
50 } // namespace views 50 } // namespace views
51 51
52 #endif // UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_ 52 #endif // UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
OLDNEW
« no previous file with comments | « ui/views/examples/checkbox_example.h ('k') | ui/views/examples/double_split_view_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698