Fixing the double border around rounded menus.

ui/views/controls/menu/menu_scroll_view_container.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/round_rect_painter.h"
 
+#if defined(USE_AURA)
+#include "ui/native_theme/native_theme_aura.h"
+#endif
+
 using ui::NativeTheme;
 
 // Height of the scroll arrow.
 // This goes up to 4 with large fonts, but this is close enough for now.
 static const int scroll_arrow_height = 3;
 
 namespace views {
 
 namespace {
 
@@ skipping 233 matching lines @@
   Layout();
 }
 
 void MenuScrollViewContainer::CreateDefaultBorder() {
   arrow_location_ = BubbleBorder::NONE;
   bubble_border_ = NULL;
 
   const MenuConfig& menu_config =
       content_view_->GetMenuItem()->GetMenuConfig();
 
+  bool use_border = true;
   int padding = menu_config.corner_radius > 0 ?
         kBorderPaddingDueToRoundedCorners : 0;
+
+#if defined(USE_AURA)
+  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;
   int bottom = menu_config.menu_vertical_border_size + padding;
   int right = menu_config.menu_horizontal_border_size + padding;
 
-  if (NativeTheme::IsNewMenuStyleEnabled()) {
+  if (use_border && NativeTheme::IsNewMenuStyleEnabled()) {
     set_border(views::Border::CreateBorderPainter(
         new views::RoundRectPainter(menu_config.native_theme->GetSystemColor(
                 ui::NativeTheme::kColorId_MenuBorderColor),
             menu_config.corner_radius),
             gfx::Insets(top, left, bottom, right)));
   } else {
     set_border(Border::CreateEmptyBorder(top, left, bottom, right));
   }
 }
 
@@ skipping 15 matching lines @@
     case views::MenuItemView::BUBBLE_ABOVE:
       return BubbleBorder::BOTTOM_CENTER;
     case views::MenuItemView::BUBBLE_BELOW:
       return BubbleBorder::TOP_CENTER;
     default:
       return BubbleBorder::NONE;
   }
 }
 
 }  // namespace views