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

Side by Side Diff: ui/views/controls/menu/menu_item_view.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 5 years 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_ITEM_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h"
13 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
14 #include "build/build_config.h" 15 #include "build/build_config.h"
15 #include "ui/base/models/menu_separator_types.h" 16 #include "ui/base/models/menu_separator_types.h"
16 #include "ui/gfx/image/image_skia.h" 17 #include "ui/gfx/image/image_skia.h"
17 #include "ui/views/controls/menu/menu_config.h" 18 #include "ui/views/controls/menu/menu_config.h"
18 #include "ui/views/controls/menu/menu_types.h" 19 #include "ui/views/controls/menu/menu_types.h"
19 #include "ui/views/view.h" 20 #include "ui/views/view.h"
20 21
21 #if defined(OS_WIN) 22 #if defined(OS_WIN)
22 #include <windows.h> 23 #include <windows.h>
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 // If set to false, the right margin will be removed for menu lines 519 // If set to false, the right margin will be removed for menu lines
519 // containing other elements. 520 // containing other elements.
520 bool use_right_margin_; 521 bool use_right_margin_;
521 522
522 DISALLOW_COPY_AND_ASSIGN(MenuItemView); 523 DISALLOW_COPY_AND_ASSIGN(MenuItemView);
523 }; 524 };
524 525
525 } // namespace views 526 } // namespace views
526 527
527 #endif // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 528 #endif // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698