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

Side by Side Diff: ui/views/controls/menu/menu_config_mac.mm

Issue 2288003002: Delete IsAtLeastOS10_9() and IsAtMostOS10_9() (Closed)
Patch Set: Rebase, cancel the more confusing changes Created 4 years, 3 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/native_theme/native_theme_mac.mm ('k') | no next file » | 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 #include "ui/views/controls/menu/menu_config.h" 5 #include "ui/views/controls/menu/menu_config.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include "base/mac/mac_util.h" 9 #include "base/mac/mac_util.h"
10 10
(...skipping 13 matching lines...) Expand all
24 item_top_margin = item_no_icon_top_margin = 1; 24 item_top_margin = item_no_icon_top_margin = 1;
25 item_bottom_margin = item_no_icon_bottom_margin = 1; 25 item_bottom_margin = item_no_icon_bottom_margin = 1;
26 item_left_margin = 2; 26 item_left_margin = 2;
27 arrow_to_edge_padding = 13; 27 arrow_to_edge_padding = 13;
28 icon_to_label_padding = 4; 28 icon_to_label_padding = 4;
29 check_width = 19; 29 check_width = 19;
30 check_height = 11; 30 check_height = 11;
31 separator_height = 13; 31 separator_height = 13;
32 separator_upper_height = 7; 32 separator_upper_height = 7;
33 separator_lower_height = 6; 33 separator_lower_height = 6;
34 separator_thickness = base::mac::IsOS10_9() ? kMenuSeparatorHeightMavericks 34 separator_thickness = base::mac::IsAtLeastOS10_10()
35 : kMenuSeparatorHeight; 35 ? kMenuSeparatorHeight
36 : kMenuSeparatorHeightMavericks;
36 align_arrow_and_shortcut = true; 37 align_arrow_and_shortcut = true;
37 icons_in_label = true; 38 icons_in_label = true;
38 check_selected_combobox_item = true; 39 check_selected_combobox_item = true;
39 corner_radius = 5; 40 corner_radius = 5;
40 use_outer_border = false; 41 use_outer_border = false;
41 } 42 }
42 43
43 } // namespace views 44 } // namespace views
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698