Harmony - convert hung renderer dialog.

ui/views/controls/button/md_text_button.cc

 // 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/controls/button/md_text_button.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/memory/ptr_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_painted_layer_delegates.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/focus_ring.h"
 #include "ui/views/painter.h"
 #include "ui/views/style/platform_style.h"
+#include "ui/views/views_delegate.h"
 
 namespace views {
 
 namespace {
 
-// Minimum size to reserve for the button contents.
-const int kMinWidth = 48;
-
 LabelButton* CreateButton(ButtonListener* listener,
                           const base::string16& text,
                           bool md) {
   if (md)
     return MdTextButton::Create(listener, text);
 
   LabelButton* button = new LabelButton(listener, text);
   button->SetStyle(CustomButton::STYLE_BUTTON);
   return button;
 }
@@ skipping 146 matching lines @@
 }
 
 MdTextButton::MdTextButton(ButtonListener* listener)
     : LabelButton(listener, base::string16()),
       is_prominent_(false) {
   SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
                                             : InkDropMode::OFF);
   set_has_ink_drop_action_on_click(true);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   SetFocusForPlatform();
-  SetMinSize(gfx::Size(kMinWidth, 0));
+  const int minimum_width =
+      ViewsDelegate::GetInstance()->GetDialogButtonMinimumWidth();
+  SetMinSize(gfx::Size(minimum_width, 0));
   SetFocusPainter(nullptr);
   label()->SetAutoColorReadabilityEnabled(false);
   set_request_focus_on_press(false);
   LabelButton::SetFontList(GetMdFontList());
 
   set_animate_on_state_change(true);
 
   // Paint to a layer so that the canvas is snapped to pixel boundaries (useful
   // for fractional DSF).
   SetPaintToLayer();
@@ skipping 24 matching lines @@
   int target_height = std::max(kBaseHeight + size_delta * 2,
                                label()->font_list().GetFontSize() * 2);
 
   int label_height = label()->GetPreferredSize().height();
   int top_padding = (target_height - label_height) / 2;
   int bottom_padding = (target_height - label_height + 1) / 2;
   DCHECK_EQ(target_height, label_height + top_padding + bottom_padding);
 
   // TODO(estade): can we get rid of the platform style border hoopla if
   // we apply the MD treatment to all buttons, even GTK buttons?
   const int kHorizontalPadding = 16;

[Peter Kasting, 2017/02/13 23:47:31]

Seems like this interacts with the minimum button width.  Really, we want
kHarmonyLayoutUnit DIP of horizontal padding on each end, plus a minimum text
width of 2 * kHarmonyLayoutUnit.  This adds up to the 4 * kHarmonyLayoutUnit
minimum width total, but rather than fix that using SetMinSize() in the
constructor, it seems like it would be better to plumb those constants here (as
a "button horizontal padding" and a "button minimum label width"?  Although
maybe the "horizontal padding" should really be a "button insets", which would
require adding a function to LayoutDelegate to return a gfx::Insets for a given
enum, which I suspect we want anyway based on the history of
chrome/browser/ui/layout_constants.h).

This raises the question of whether the early-out atop this function when the
label is empty is correct.  I don't know when we use an MdTextButton with no
text.  We should find one and decide what the right thing per the spec is so we
know how to handle this.  This would apply even if we wanted to keep the
SetMinSize() implementation.

[Bret, 2017/02/16 00:25:02]

The problem here is the label width is controlled by LabelButton, not here, and
it doesn't have a concept of "minimum label size" right now. Plus most
subclasses of LabelButton set their padding ad hoc, so it wouldn't be much use
to add it outside of harmony. That said, I plumbed in the horizontal padding
from ViewsDelegate in the interest of centralizing constants and defining
everything in terms of layout units. I also changed the definition of
DIALOG_BUTTON_MINIMUM_WIDTH to use the new BUTTON_HORIZONTAL_PADDING.

As far as the early-out above, it seems weird to me that we would ever make an
MdTextButton with no text. I'm guessing it's more for the case where the object
has been created but not fully initialized by the parent view.

   SetBorder(CreateEmptyBorder(top_padding, kHorizontalPadding, bottom_padding,
                               kHorizontalPadding));
 }
 
 void MdTextButton::UpdateColors() {
   ui::NativeTheme::ColorId fg_color_id =
       is_prominent_ ? ui::NativeTheme::kColorId_TextOnProminentButtonColor
                     : ui::NativeTheme::kColorId_ButtonEnabledColor;
 
   ui::NativeTheme* theme = GetNativeTheme();
@@ skipping 43 matching lines @@
         stroke_color, gfx::kDisabledControlAlpha);
   }
 
   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   set_background(Background::CreateBackgroundPainter(
       Painter::CreateRoundRectWith1PxBorderPainter(bg_color, stroke_color,
                                                    kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views