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 dfb9ef364ee6b2257b346a0e0d56b512b38024e2..ea02917f94a18ff2c53edf9880988a40e74d6301 100644 |
--- a/ui/views/controls/menu/menu_scroll_view_container.cc |
+++ b/ui/views/controls/menu/menu_scroll_view_container.cc |
@@ -281,12 +281,14 @@ void MenuScrollViewContainer::CreateDefaultBorder() { |
int padding = menu_config.corner_radius > 0 ? |
kBorderPaddingDueToRoundedCorners : 0; |
+#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
Elliot Glaysher
2014/04/21 22:43:20
If you're bracing these with #if checks, you proba
Evan Stade
2014/04/22 18:33:22
No, I think menu_config_views.cc is OK as-is. I ju
Elliot Glaysher
2014/04/22 19:48:27
I can see us wanting to use the aura colors. Howev
|
if (menu_config.native_theme == ui::NativeThemeAura::instance()) { |
// In case of NativeThemeAura the border gets drawn with the shadow. |
// Furthermore no additional padding is wanted. |
use_border = false; |
padding = 0; |
} |
+#endif |
int top = menu_config.menu_vertical_border_size + padding; |
int left = menu_config.menu_horizontal_border_size + padding; |