views: remove PlatformStyle::CreateLabelButtonBorder

ui/views/style/platform_style_mac.mm

 // Copyright 2015 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/platform_style.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.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"
 #import "ui/views/controls/scrollbar/cocoa_scroll_bar.h"
 #include "ui/views/style/mac/combobox_background_mac.h"
-#include "ui/views/style/mac/dialog_button_border_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 namespace views {
 
 const int PlatformStyle::kComboboxNormalArrowPadding = 0;
 const int PlatformStyle::kMinLabelButtonWidth = 32;
 const int PlatformStyle::kMinLabelButtonHeight = 30;
 const bool PlatformStyle::kDefaultLabelButtonHasBoldFont = false;
 const bool PlatformStyle::kDialogDefaultButtonCanBeCancel = false;
@@ skipping 25 matching lines @@
   return base::WrapUnique(new FocusableRoundedBorder);
 }
 
 // static
 std::unique_ptr<Background> PlatformStyle::CreateComboboxBackground(
     int shoulder_width) {
   return base::MakeUnique<ComboboxBackgroundMac>(shoulder_width);
 }
 
 // static
-std::unique_ptr<LabelButtonBorder> PlatformStyle::CreateLabelButtonBorder(
-    Button::ButtonStyle style) {
-  if (style == Button::STYLE_BUTTON)
-    return base::MakeUnique<DialogButtonBorderMac>();
-
-  return base::MakeUnique<LabelButtonAssetBorder>(style);
-}
-
-// static
 std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) {
   return base::MakeUnique<CocoaScrollBar>(is_horizontal);
 }
 
 // static
 SkColor PlatformStyle::TextColorForButton(
     const ButtonColorByState& color_by_state,
     const LabelButton& button) {
   Button::ButtonState state = button.state();
-  if (button.style() == Button::STYLE_BUTTON &&
-      DialogButtonBorderMac::ShouldRenderDefault(button)) {
+  if (button.style() == Button::STYLE_BUTTON && button.is_default()) {
     // For convenience, we currently assume Mac wants the color corresponding to
     // the pressed state for default buttons.
     state = Button::STATE_PRESSED;
   }
   return color_by_state[state];
 }
 
 // static
 void PlatformStyle::ApplyLabelButtonTextStyle(
     views::Label* label,
     ButtonColorByState* color_by_state) {
   const ui::NativeTheme* theme = label->GetNativeTheme();
   ButtonColorByState& colors = *color_by_state;
   colors[Button::STATE_PRESSED] =
       theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonHighlightColor);
 }
 
 // static
 void PlatformStyle::OnTextfieldKeypressUnhandled() {
   NSBeep();
 }
 
 }  // namespace views