| Index: ui/views/controls/combobox/combobox.cc
|
| diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
|
| index 24c51702b2d11798c62274c4add4f29ea5629a8b..99d025354e69f1a1c3570c0d08e74473594202b0 100644
|
| --- a/ui/views/controls/combobox/combobox.cc
|
| +++ b/ui/views/controls/combobox/combobox.cc
|
| @@ -452,7 +452,8 @@ Combobox::Combobox(ui::ComboboxModel* model, Style style)
|
| SetPaintToLayer();
|
| layer()->SetFillsBoundsOpaquely(false);
|
| } else {
|
| - arrow_image_ = PlatformStyle::CreateComboboxArrow(enabled(), style);
|
| + arrow_image_ = *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| + IDR_MENU_DROPARROW);
|
| }
|
| }
|
|
|
| @@ -550,12 +551,6 @@ void Combobox::Layout() {
|
| arrow_button_->SetBounds(arrow_button_x, 0, arrow_button_width, height());
|
| }
|
|
|
| -void Combobox::OnEnabledChanged() {
|
| - View::OnEnabledChanged();
|
| - if (!UseMd())
|
| - arrow_image_ = PlatformStyle::CreateComboboxArrow(enabled(), style_);
|
| -}
|
| -
|
| void Combobox::OnNativeThemeChanged(const ui::NativeTheme* theme) {
|
| if (!UseMd())
|
| return;
|
| @@ -1013,9 +1008,9 @@ PrefixSelector* Combobox::GetPrefixSelector() {
|
| }
|
|
|
| int Combobox::GetArrowContainerWidth() const {
|
| - const int kMdPaddingWidth = 8;
|
| - int arrow_pad = UseMd() ? kMdPaddingWidth
|
| - : PlatformStyle::kComboboxNormalArrowPadding;
|
| + constexpr int kMdPaddingWidth = 8;
|
| + constexpr int kNormalPaddingWidth = 7;
|
| + int arrow_pad = UseMd() ? kMdPaddingWidth : kNormalPaddingWidth;
|
| int padding = style_ == STYLE_NORMAL
|
| ? arrow_pad * 2
|
| : kActionLeftPadding + kActionRightPadding;
|
|
|