Harmony - Use FocusableBorder for comboboxes on Mac

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 391 matching lines @@
       size_to_largest_label_(style_ == STYLE_NORMAL),
       weak_ptr_factory_(this) {
   ModelChanged();
 #if defined(OS_MACOSX)
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
   SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
 
   UpdateBorder();
-  if (UseMd()) {
-    // set_background() takes ownership but takes a raw pointer.
-    std::unique_ptr<Background> b =
-        PlatformStyle::CreateComboboxBackground(GetArrowContainerWidth());
-    set_background(b.release());
-  }
 
   // Initialize the button images.
   Button::ButtonState button_states[] = {
     Button::STATE_DISABLED,
     Button::STATE_NORMAL,
     Button::STATE_HOVERED,
     Button::STATE_PRESSED,
   };
   for (int i = 0; i < 2; i++) {
     for (size_t state_index = 0; state_index < arraysize(button_states);
@@ skipping 115 matching lines @@
 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(

[Evan Stade, 2016/10/06 15:56:37]

ah, look --- the bg was being overridden anyway

       true, Painter::CreateSolidRoundRectPainter(
                 theme->GetSystemColor(
                     ui::NativeTheme::kColorId_TextfieldDefaultBackground),
                 FocusableBorder::kCornerRadiusDp)));
 }
 
 int Combobox::GetRowCount() {
   return model()->GetItemCount();
 }
 
@@ skipping 196 matching lines @@
     ui::MenuSourceType source_type = ui::MENU_SOURCE_MOUSE;
     if (event.IsKeyEvent())
       source_type = ui::MENU_SOURCE_KEYBOARD;
     else if (event.IsGestureEvent() || event.IsTouchEvent())
       source_type = ui::MENU_SOURCE_TOUCH;
     ShowDropDownMenu(source_type);
   }
 }
 
 void Combobox::UpdateBorder() {
-  std::unique_ptr<FocusableBorder> border(
-      PlatformStyle::CreateComboboxBorder());
+  std::unique_ptr<FocusableBorder> border =
+      PlatformStyle::CreateComboboxBorder();
+  if (UseMd())
+    border.reset(new FocusableBorder());
   if (style_ == STYLE_ACTION)
     border->SetInsets(5, 10, 5, 10);
   if (invalid_)
     border->SetColor(gfx::kGoogleRed700);
   SetBorder(std::move(border));
 }
 
 void Combobox::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(GetMirroredXForRect(*rect));
 }
@@ skipping 215 matching lines @@
   const int kMdPaddingWidth = 8;
   int arrow_pad = UseMd() ? kMdPaddingWidth
                           : PlatformStyle::kComboboxNormalArrowPadding;
   int padding = style_ == STYLE_NORMAL
                     ? arrow_pad * 2
                     : kActionLeftPadding + kActionRightPadding;
   return ArrowSize().width() + padding;
 }
 
 }  // namespace views