| Index: ui/views/style/platform_style_mac.mm
|
| diff --git a/ui/views/style/platform_style_mac.mm b/ui/views/style/platform_style_mac.mm
|
| index 1fb13f32a554ed486c3021b84e7bd534ac77104f..cbe9be51ce15d0094f4546ee536b1cf0bf603def 100644
|
| --- a/ui/views/style/platform_style_mac.mm
|
| +++ b/ui/views/style/platform_style_mac.mm
|
| @@ -4,6 +4,10 @@
|
|
|
| #include "ui/views/style/platform_style.h"
|
|
|
| +#include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/gfx/paint_vector_icon.h"
|
| +#include "ui/gfx/vector_icons.h"
|
| +#include "ui/resources/grit/ui_resources.h"
|
| #include "ui/views/controls/button/label_button.h"
|
| #include "ui/views/controls/button/label_button_border.h"
|
| #include "ui/views/controls/focusable_rounded_border_mac.h"
|
| @@ -14,6 +18,21 @@
|
| namespace views {
|
|
|
| // static
|
| +gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
|
| + Combobox::Style style) {
|
| + // TODO(ellyjones): IDR_MENU_DROPARROW is a cross-platform image that doesn't
|
| + // look right on Mac. See https://crbug.com/384071.
|
| + if (style == Combobox::STYLE_ACTION) {
|
| + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| + return *rb.GetImageSkiaNamed(IDR_MENU_DROPARROW);
|
| + }
|
| + const int kComboboxArrowWidth = 13;
|
| + return gfx::CreateVectorIcon(gfx::VectorIconId::COMBOBOX_ARROW_MAC,
|
| + kComboboxArrowWidth,
|
| + is_enabled ? SK_ColorWHITE : SK_ColorBLACK);
|
| +}
|
| +
|
| +// static
|
| scoped_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
|
| return make_scoped_ptr(new FocusableRoundedBorder);
|
| }
|
|
|