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"
@@ skipping 252 matching lines @@
   Layout();
 }
 
 void MenuScrollViewContainer::CreateDefaultBorder() {
   arrow_location_ = BubbleBorder::NONE;
   bubble_border_ = NULL;
 
   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 NativeThemeAura, not
chromeos. Can we set the corner_radius to 0 in menuconfigviews and have that
imply an empty border?

[Mr4D (OOO till 08-26), 2013/02/13 00:34:15]

Okay, I looked at the NativeThemeAura as requested. For the corner_radius of 0:
Windows has currently a corner_radius of 0 because of the shadow which cannot
have round edges. So that is not a good way to detect this case.

+  // 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;
   int right = menu_config.menu_horizontal_border_size + padding;
 
   if (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));
   }
+#endif
 }
 
 void MenuScrollViewContainer::CreateBubbleBorder() {
   bubble_border_ =
       new BubbleBorder(arrow_location_, BubbleBorder::NO_SHADOW, SK_ColorWHITE);
   set_border(bubble_border_);
   set_background(new BubbleBackground(bubble_border_));
 }
 
 BubbleBorder::ArrowLocation
 MenuScrollViewContainer::BubbleBorderTypeFromAnchor(
     MenuItemView::AnchorPosition anchor) {
   switch (anchor) {
     case views::MenuItemView::BUBBLE_LEFT:
       return BubbleBorder::RIGHT_CENTER;
     case views::MenuItemView::BUBBLE_RIGHT:
       return BubbleBorder::LEFT_CENTER;
     case views::MenuItemView::BUBBLE_ABOVE:
       return BubbleBorder::BOTTOM_CENTER;
     case views::MenuItemView::BUBBLE_BELOW:
       return BubbleBorder::TOP_CENTER;
     default:
       return BubbleBorder::NONE;
   }
 }
 
 }  // namespace views