MacViews: Style BUTTON_STYLE buttons using the "modern" UI

ui/views/style/mac/combobox_background_mac.cc

 // Copyright 2016 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/style/mac/combobox_background_mac.h"
 
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme_mac.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/view.h"
 
+using ui::NativeThemeMac;
+
 namespace views {
 
 ComboboxBackgroundMac::ComboboxBackgroundMac() {}
 
 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(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);
 
-  ui::NativeTheme::State state = ui::NativeTheme::kNormal;
+  // 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())
-    state = ui::NativeTheme::kDisabled;
+    type = NativeThemeMac::ButtonBackgroundType::DISABLED;
 
   SkPaint paint;
   paint.setShader(
-      ui::NativeThemeMac::GetButtonBackgroundShader(
-          state,
-          bounds.height()));
+      NativeThemeMac::GetButtonBackgroundShader(type, bounds.height()));
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
 
   SkPoint no_curve = SkPoint::Make(0, 0);
   SkPoint curve = SkPoint::Make(
       ui::NativeThemeMac::kComboboxCornerRadius,
       ui::NativeThemeMac::kComboboxCornerRadius);
   SkVector curves[4] = { no_curve, curve, curve, no_curve };
 
   SkRRect fill_rect;
   fill_rect.setRectRadii(gfx::RectFToSkRect(bounds), curves);
 
   SkPath path;
   path.addRRect(fill_rect);
 
   canvas->DrawPath(path, paint);
 }
 
 }  // namespace views