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

ui/native_theme/native_theme_aura.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/native_theme/native_theme_aura.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/native_theme/common_theme.h"
+#include "ui/views/controls/menu/menu_config.h"

[sky, 2013/01/25 16:10:52]

ui shouldn't depend upon views like this. Otherwise we end up with circular
dependencies. Instead push has_rounded_corners to NativeTheme.

[varunjain, 2013/01/25 18:50:40]

Done as discussed offline.

+#include "ui/views/round_rect_painter.h"
 
 namespace {
 
 const SkColor kMenuBackgroundColor = SK_ColorWHITE;
 
 // Theme colors returned by GetSystemColor().
 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
 // Windows:
 const SkColor kWindowBackgroundColor = SK_ColorWHITE;
 // Dialogs:
@@ skipping 162 matching lines @@
     case kColorId_MenuBorderColor:
       NOTREACHED();
       break;
   }
 
   return kInvalidColorIdColor;
 }
 
 void NativeThemeAura::PaintMenuPopupBackground(SkCanvas* canvas,
                                                const gfx::Size& size) const {
-  canvas->drawColor(kMenuBackgroundColor, SkXfermode::kSrc_Mode);
+  if (views::MenuConfig::instance(instance()).has_rounded_corners) {
+    SkPaint paint;
+    paint.setStyle(SkPaint::kFill_Style);
+    paint.setFlags(SkPaint::kAntiAlias_Flag);
+    paint.setColor(kMenuBackgroundColor);
+
+    gfx::Path path;
+    views::RoundRectPainter::CreateRoundRectPath(gfx::Rect(size), &path);
+
+    canvas->drawPath(path, paint);
+  } else {
+    canvas->drawColor(kMenuBackgroundColor, SkXfermode::kSrc_Mode);
+  }
 }
 
 void NativeThemeAura::PaintScrollbarTrack(
     SkCanvas* canvas,
     Part part,
     State state,
     const ScrollbarTrackExtraParams& extra_params,
     const gfx::Rect& rect) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (part == kScrollbarVerticalTrack) {
@@ skipping 135 matching lines @@
       DrawTiledImage(canvas, *center,
                      0, 0, 1.0, 1.0,
                      rect.x() + left->width(), rect.y(),
                      rect.width() - left->width() - right->width(),
                      center->height());
     }
   }
 }
 
 }  // namespace ui