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

Side by Side Diff: ui/views/controls/menu/menu_model_adapter.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
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_CONTROLS_MENU_MENU_MODEL_ADAPTER_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_MODEL_ADAPTER_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_MODEL_ADAPTER_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_MODEL_ADAPTER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ui/views/controls/menu/menu_delegate.h" 10 #include "ui/views/controls/menu/menu_delegate.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 protected: 56 protected:
57 // Create and add a menu item to |menu| for the item at index |index| in 57 // Create and add a menu item to |menu| for the item at index |index| in
58 // |model|. Subclasses override this to allow custom items to be added to the 58 // |model|. Subclasses override this to allow custom items to be added to the
59 // menu. 59 // menu.
60 virtual MenuItemView* AppendMenuItem(MenuItemView* menu, 60 virtual MenuItemView* AppendMenuItem(MenuItemView* menu,
61 ui::MenuModel* model, 61 ui::MenuModel* model,
62 int index); 62 int index);
63 63
64 // views::MenuDelegate implementation. 64 // views::MenuDelegate implementation.
65 virtual void ExecuteCommand(int id) OVERRIDE; 65 virtual void ExecuteCommand(int id) override;
66 virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; 66 virtual void ExecuteCommand(int id, int mouse_event_flags) override;
67 virtual bool IsTriggerableEvent(MenuItemView* source, 67 virtual bool IsTriggerableEvent(MenuItemView* source,
68 const ui::Event& e) OVERRIDE; 68 const ui::Event& e) override;
69 virtual bool GetAccelerator(int id, 69 virtual bool GetAccelerator(int id,
70 ui::Accelerator* accelerator) const OVERRIDE; 70 ui::Accelerator* accelerator) const override;
71 virtual base::string16 GetLabel(int id) const OVERRIDE; 71 virtual base::string16 GetLabel(int id) const override;
72 virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE; 72 virtual const gfx::FontList* GetLabelFontList(int id) const override;
73 virtual bool IsCommandEnabled(int id) const OVERRIDE; 73 virtual bool IsCommandEnabled(int id) const override;
74 virtual bool IsCommandVisible(int id) const OVERRIDE; 74 virtual bool IsCommandVisible(int id) const override;
75 virtual bool IsItemChecked(int id) const OVERRIDE; 75 virtual bool IsItemChecked(int id) const override;
76 virtual void SelectionChanged(MenuItemView* menu) OVERRIDE; 76 virtual void SelectionChanged(MenuItemView* menu) override;
77 virtual void WillShowMenu(MenuItemView* menu) OVERRIDE; 77 virtual void WillShowMenu(MenuItemView* menu) override;
78 virtual void WillHideMenu(MenuItemView* menu) OVERRIDE; 78 virtual void WillHideMenu(MenuItemView* menu) override;
79 79
80 private: 80 private:
81 // Implementation of BuildMenu(). 81 // Implementation of BuildMenu().
82 void BuildMenuImpl(MenuItemView* menu, ui::MenuModel* model); 82 void BuildMenuImpl(MenuItemView* menu, ui::MenuModel* model);
83 83
84 // Container of ui::MenuModel pointers as encountered by preorder 84 // Container of ui::MenuModel pointers as encountered by preorder
85 // traversal. The first element is always the top-level model 85 // traversal. The first element is always the top-level model
86 // passed to the constructor. 86 // passed to the constructor.
87 ui::MenuModel* menu_model_; 87 ui::MenuModel* menu_model_;
88 88
89 // Mouse event flags which can trigger menu actions. 89 // Mouse event flags which can trigger menu actions.
90 int triggerable_event_flags_; 90 int triggerable_event_flags_;
91 91
92 // Map MenuItems to MenuModels. Used to implement WillShowMenu(). 92 // Map MenuItems to MenuModels. Used to implement WillShowMenu().
93 std::map<MenuItemView*, ui::MenuModel*> menu_map_; 93 std::map<MenuItemView*, ui::MenuModel*> menu_map_;
94 94
95 DISALLOW_COPY_AND_ASSIGN(MenuModelAdapter); 95 DISALLOW_COPY_AND_ASSIGN(MenuModelAdapter);
96 }; 96 };
97 97
98 } // namespace views 98 } // namespace views
99 99
100 #endif // UI_VIEWS_CONTROLS_MENU_MENU_MODEL_ADAPTER_H_ 100 #endif // UI_VIEWS_CONTROLS_MENU_MENU_MODEL_ADAPTER_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_message_pump_dispatcher_win.h ('k') | ui/views/controls/menu/menu_model_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698