MenuButton: support Mac look & feel

ui/views/style/mac/combobox_background_mac.cc

Index: ui/views/style/mac/combobox_background_mac.cc
diff --git a/ui/views/style/mac/combobox_background_mac.cc b/ui/views/style/mac/combobox_background_mac.cc
index 805f97d2751c6aad18effdb7c714467dbef9548d..c1b1de97fd43886b8de197250a59a5fe10f99ca9 100644
--- a/ui/views/style/mac/combobox_background_mac.cc
+++ b/ui/views/style/mac/combobox_background_mac.cc
@@ -7,6 +7,7 @@
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/scoped_canvas.h"
 #include "ui/native_theme/native_theme_mac.h"
 #include "ui/views/controls/combobox/combobox.h"

[tapted, 2016/04/21 06:06:46]

can this be removed now? (or replaced with view.h?)

[Elly Fong-Jones, 2016/04/21 15:30:26]

Done.

 #include "ui/views/view.h"
@@ -15,26 +16,30 @@ using ui::NativeThemeMac;
 
 namespace views {
 
-ComboboxBackgroundMac::ComboboxBackgroundMac() {}
+ComboboxBackgroundMac::ComboboxBackgroundMac(int width) : width_(width) {}
 
 ComboboxBackgroundMac::~ComboboxBackgroundMac() {}
 
 void ComboboxBackgroundMac::Paint(gfx::Canvas* canvas, View* view) const {
-  DCHECK_EQ(view->GetClassName(), Combobox::kViewClassName);
-  Combobox* combobox = static_cast<Combobox*>(view);
+  gfx::RectF bounds(view->GetLocalBounds());
+  gfx::ScopedCanvas scoped_canvas(canvas);
+
+  if (base::i18n::IsRTL()) {

[tapted, 2016/04/21 06:06:46]

Should we plonk this on gfx::ScopedCanvas - Maybe inherit from ScopedCanvas with
a ScopedRTLFlippedCanvas? I feel like this pattern comes up a whole bunch, and
the code is a bit like voodoo. 

gfx::Canvas already has a base::i18n::IsRTL dependency, so I don't think there
will be any complaints putting it into scoped_canvas.h

[Elly Fong-Jones, 2016/04/21 15:30:26]

Done.

+    canvas->Translate(gfx::Vector2d(bounds.width(), 0));
+    canvas->Scale(-1, 1);
+  }
 
-  gfx::RectF bounds(combobox->GetLocalBounds());
   // Inset the left side far enough to draw only the arrow button, and inset the
   // other three sides by half a pixel so the edge of the background doesn't
   // paint outside the border.
-  bounds.Inset(bounds.width() - combobox->GetArrowButtonWidth(), 0.5, 0.5, 0.5);
+  bounds.Inset(bounds.width() - width_, 0.5, 0.5, 0.5);
 
   // TODO(tapted): Check whether the Widget is active, and use the NORMAL
   // BackgroundType if it is inactive. Handling this properly also requires the
   // control to observe the Widget for activation changes and invalidate.
   NativeThemeMac::ButtonBackgroundType type =
       NativeThemeMac::ButtonBackgroundType::HIGHLIGHTED;
-  if (!combobox->enabled())
+  if (!view->enabled())
     type = NativeThemeMac::ButtonBackgroundType::DISABLED;
 
   SkPaint paint;