Chromium Code Reviews| Index: ui/views/controls/menu/menu_scroll_view_container.cc |
| diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc |
| index afb0d06981cf7affdb479b9697febcdfe8520a39..1cd7a048db96b43e49da82c47f86d53392bacf1a 100644 |
| --- a/ui/views/controls/menu/menu_scroll_view_container.cc |
| +++ b/ui/views/controls/menu/menu_scroll_view_container.cc |
| @@ -270,8 +270,18 @@ void MenuScrollViewContainer::CreateDefaultBorder() { |
| const MenuConfig& menu_config = |
| content_view_->GetMenuItem()->GetMenuConfig(); |
| +#if defined(OS_CHROMEOS) |
|
sky
2013/02/13 00:06:53
This should be based on whether the NativeTheme is
Mr4D (OOO till 08-26)
2013/02/13 00:34:15
Okay, I looked at the NativeThemeAura as requested
|
| + // On ChromeOS the border gets drawn with the shadow. Furthermore no |
| + // additional padding is wanted. |
| + set_border(Border::CreateEmptyBorder( |
| + menu_config.menu_vertical_border_size, |
| + menu_config.menu_horizontal_border_size, |
| + menu_config.menu_vertical_border_size, |
| + menu_config.menu_horizontal_border_size)); |
| +#else |
| int padding = menu_config.corner_radius > 0 ? |
| kBorderPaddingDueToRoundedCorners : 0; |
| + |
| int top = menu_config.menu_vertical_border_size + padding; |
| int left = menu_config.menu_horizontal_border_size + padding; |
| int bottom = menu_config.menu_vertical_border_size + padding; |
| @@ -286,6 +296,7 @@ void MenuScrollViewContainer::CreateDefaultBorder() { |
| } else { |
| set_border(Border::CreateEmptyBorder(top, left, bottom, right)); |
| } |
| +#endif |
| } |
| void MenuScrollViewContainer::CreateBubbleBorder() { |