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

Side by Side Diff: ui/views/controls/menu/menu_model_adapter.h

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 "base/macros.h"
10 #include "ui/views/controls/menu/menu_delegate.h" 11 #include "ui/views/controls/menu/menu_delegate.h"
11 12
12 namespace ui { 13 namespace ui {
13 class MenuModel; 14 class MenuModel;
14 } 15 }
15 16
16 namespace views { 17 namespace views {
17 class MenuItemView; 18 class MenuItemView;
18 19
19 // This class wraps an instance of ui::MenuModel with the 20 // This class wraps an instance of ui::MenuModel with the
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 90
90 // Map MenuItems to MenuModels. Used to implement WillShowMenu(). 91 // Map MenuItems to MenuModels. Used to implement WillShowMenu().
91 std::map<MenuItemView*, ui::MenuModel*> menu_map_; 92 std::map<MenuItemView*, ui::MenuModel*> menu_map_;
92 93
93 DISALLOW_COPY_AND_ASSIGN(MenuModelAdapter); 94 DISALLOW_COPY_AND_ASSIGN(MenuModelAdapter);
94 }; 95 };
95 96
96 } // namespace views 97 } // namespace views
97 98
98 #endif // UI_VIEWS_CONTROLS_MENU_MENU_MODEL_ADAPTER_H_ 99 #endif // UI_VIEWS_CONTROLS_MENU_MENU_MODEL_ADAPTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698