Fix menu corners: the menu background was being painted as a rect when in fact,

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/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"
 
 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 {
 
+static const int kBorderPaddingDueToRoundedCorners = 1;
+
 // MenuScrollButton ------------------------------------------------------------
 
 // MenuScrollButton is used for the scroll buttons when not all menu items fit
 // on screen. MenuScrollButton forwards appropriate events to the
 // MenuController.
 
 class MenuScrollButton : public View {
  public:
   MenuScrollButton(SubmenuView* host, bool is_up)
       : host_(host),
@@ skipping 129 matching lines @@
   scroll_down_button_ = new MenuScrollButton(content_view, false);
   AddChildView(scroll_up_button_);
   AddChildView(scroll_down_button_);
 
   scroll_view_ = new MenuScrollView(content_view);
   AddChildView(scroll_view_);
 
   const MenuConfig& menu_config =
       content_view_->GetMenuItem()->GetMenuConfig();
 
+  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)),
-        gfx::Insets(menu_config.menu_vertical_border_size,
-                    menu_config.menu_horizontal_border_size,
-                    menu_config.menu_vertical_border_size,
-                    menu_config.menu_horizontal_border_size)));
+                ui::NativeTheme::kColorId_MenuBorderColor),
+            menu_config.corner_radius),
+            gfx::Insets(top, left, bottom, right)));
   } else {
-    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));
+    set_border(Border::CreateEmptyBorder(top, left, bottom, right));
   }
 }
 
 void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
   if (background()) {
     View::OnPaintBackground(canvas);
     return;
   }
 
   gfx::Rect bounds(0, 0, width(), height());
   NativeTheme::ExtraParams extra;
+  const MenuConfig& menu_config = content_view_->GetMenuItem()->GetMenuConfig();
+  extra.menu_background.corner_radius = menu_config.corner_radius;
   GetNativeTheme()->Paint(canvas->sk_canvas(),
       NativeTheme::kMenuPopupBackground, NativeTheme::kNormal, bounds, extra);
 }
 
 void MenuScrollViewContainer::Layout() {
   gfx::Insets insets = GetInsets();
   int x = insets.left();
   int y = insets.top();
   int width = View::width() - insets.width();
   int content_height = height() - insets.height();
@@ skipping 39 matching lines @@
 
 void MenuScrollViewContainer::OnBoundsChanged(
     const gfx::Rect& previous_bounds) {
   gfx::Size content_pref = scroll_view_->GetContents()->GetPreferredSize();
   scroll_up_button_->SetVisible(content_pref.height() > height());
   scroll_down_button_->SetVisible(content_pref.height() > height());
   Layout();
 }
 
 }  // namespace views