views: remove PlatformStyle combobox hooks

ui/views/controls/combobox/combobox.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/views/controls/combobox/combobox.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 434 matching lines @@
   arrow_button_->SetVisible(true);
   AddChildView(text_button_);
   AddChildView(arrow_button_);
 
   // A layer is applied to make sure that canvas bounds are snapped to pixel
   // boundaries (for the sake of drawing the arrow).
   if (UseMd()) {
     SetPaintToLayer();
     layer()->SetFillsBoundsOpaquely(false);
   } else {
-    arrow_image_ = PlatformStyle::CreateComboboxArrow(enabled(), style);
+    arrow_image_ = *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+        IDR_MENU_DROPARROW);
   }
 }
 
 Combobox::~Combobox() {
   if (GetInputMethod() && selector_.get()) {
     // Combobox should have been blurred before destroy.
     DCHECK(selector_.get() != GetInputMethod()->GetTextInputClient());
   }
 }
 
@@ skipping 77 matching lines @@
       text_button_width = width() - arrow_button_width;
       break;
     }
   }
 
   int arrow_button_x = std::max(0, text_button_width);
   text_button_->SetBounds(0, 0, std::max(0, text_button_width), height());
   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;
 
   set_background(
       Background::CreateBackgroundPainter(Painter::CreateSolidRoundRectPainter(
           theme->GetSystemColor(
               ui::NativeTheme::kColorId_TextfieldDefaultBackground),
           FocusableBorder::kCornerRadiusDp)));
 }
@@ skipping 437 matching lines @@
   return gfx::Size(width, font_list.GetHeight());
 }
 
 PrefixSelector* Combobox::GetPrefixSelector() {
   if (!selector_)
     selector_.reset(new PrefixSelector(this, this));
   return selector_.get();
 }
 
 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;
   return ArrowSize().width() + padding;
 }
 
 }  // namespace views