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

Side by Side Diff: ui/base/models/simple_combobox_model.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/base/models/list_model_unittest.cc ('k') | ui/base/models/simple_menu_model.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_BASE_MODELS_SIMPLE_COMBOBOX_MODEL_H_ 5 #ifndef UI_BASE_MODELS_SIMPLE_COMBOBOX_MODEL_H_
6 #define UI_BASE_MODELS_SIMPLE_COMBOBOX_MODEL_H_ 6 #define UI_BASE_MODELS_SIMPLE_COMBOBOX_MODEL_H_
7 7
8 #include "ui/base/models/combobox_model.h" 8 #include "ui/base/models/combobox_model.h"
9 9
10 #include <vector> 10 #include <vector>
11 11
12 namespace ui { 12 namespace ui {
13 13
14 // A simple data model for a combobox that takes a string16 vector as the items. 14 // A simple data model for a combobox that takes a string16 vector as the items.
15 // An empty string will be a separator. 15 // An empty string will be a separator.
16 class UI_BASE_EXPORT SimpleComboboxModel : public ComboboxModel { 16 class UI_BASE_EXPORT SimpleComboboxModel : public ComboboxModel {
17 public: 17 public:
18 explicit SimpleComboboxModel(const std::vector<base::string16>& items); 18 explicit SimpleComboboxModel(const std::vector<base::string16>& items);
19 virtual ~SimpleComboboxModel(); 19 virtual ~SimpleComboboxModel();
20 20
21 // ui::ComboboxModel: 21 // ui::ComboboxModel:
22 virtual int GetItemCount() const OVERRIDE; 22 virtual int GetItemCount() const override;
23 virtual base::string16 GetItemAt(int index) OVERRIDE; 23 virtual base::string16 GetItemAt(int index) override;
24 virtual bool IsItemSeparatorAt(int index) OVERRIDE; 24 virtual bool IsItemSeparatorAt(int index) override;
25 virtual int GetDefaultIndex() const OVERRIDE; 25 virtual int GetDefaultIndex() const override;
26 26
27 private: 27 private:
28 const std::vector<base::string16> items_; 28 const std::vector<base::string16> items_;
29 29
30 DISALLOW_COPY_AND_ASSIGN(SimpleComboboxModel); 30 DISALLOW_COPY_AND_ASSIGN(SimpleComboboxModel);
31 }; 31 };
32 32
33 } // namespace ui 33 } // namespace ui
34 34
35 #endif // UI_BASE_MODELS_SIMPLE_COMBOBOX_MODEL_H_ 35 #endif // UI_BASE_MODELS_SIMPLE_COMBOBOX_MODEL_H_
OLDNEW
« no previous file with comments | « ui/base/models/list_model_unittest.cc ('k') | ui/base/models/simple_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698