Harmony - convert hung renderer dialog.

ui/views/window/dialog_client_view.cc

Index: ui/views/window/dialog_client_view.cc
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index ee88f8654e741d8370cbb236fb3f1f24aeef8efb..5fd2009f28d8da6e4a54f38a2155a948bd167ce2 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -42,9 +42,7 @@ bool ShouldShow(View* view) {
 }
 
 // Do the layout for a button.
-void LayoutButton(LabelButton* button,
-                  gfx::Rect* row_bounds,
-                  int button_height) {
+void LayoutButton(View* button, gfx::Rect* row_bounds, int button_height) {
   if (!button)
     return;
 
@@ -81,9 +79,6 @@ DialogClientView::DialogClientView(Widget* owner, View* contents_view)
   // Doing this now ensures this accelerator will have lower priority than
   // one set by the contents view.
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
-
-  if (ViewsDelegate::GetInstance())
-    button_row_insets_ = ViewsDelegate::GetInstance()->GetDialogButtonInsets();
 }
 
 DialogClientView::~DialogClientView() {
@@ -225,9 +220,13 @@ void DialogClientView::Layout() {
         custom_padding -= GetButtonsAndExtraViewRowTopPadding();
         row_bounds.set_width(row_bounds.width() - custom_padding);
       }
-      row_bounds.set_width(std::min(row_bounds.width(),
-          extra_view_->GetPreferredSize().width()));
-      extra_view_->SetBoundsRect(row_bounds);
+      if (GetDialogDelegate()->GroupExtraViewWithButtons()) {
+        LayoutButton(extra_view_, &row_bounds, button_height);

[tapted, 2017/02/03 02:07:54]

I think |extra_view_| is sometimes not a button -- e.g. Add to Desktop. I guess
this is OK so long as GroupExtraViewWithButtons() is only overridden to return
true when the extra view is actually a button. (and perhaps it is OK even if it
isn't a button). So this looks fine.

[Bret, 2017/02/03 21:58:35]

Right, LayoutButton is agnostic to whether the view is an actual button. I
considered renaming it, but I figured it would be really odd for someone to want
to group a view that wasn't a button, so I left it.

+      } else {
+        row_bounds.set_width(std::min(row_bounds.width(),
+                                      extra_view_->GetPreferredSize().width()));
+        extra_view_->SetBoundsRect(row_bounds);
+      }
     }
 
     if (height > 0)
@@ -346,8 +345,9 @@ LabelButton* DialogClientView::CreateDialogButton(ui::DialogButton type) {
     button = MdTextButton::CreateSecondaryUiButton(this, title);
   }
 
-  const int kDialogMinButtonWidth = 75;
-  button->SetMinSize(gfx::Size(kDialogMinButtonWidth, 0));
+  // In harmony the minimum size is handled by MdTextButton.
+  if (!ui::MaterialDesignController::IsSecondaryUiMaterial())
+    button->SetMinSize(gfx::Size(kDialogMinimumButtonWidth, 0));
   button->SetGroup(kButtonGroup);
   return button;
 }
@@ -372,6 +372,10 @@ gfx::Insets DialogClientView::GetButtonRowInsets() const {
 }
 
 int DialogClientView::GetButtonsAndExtraViewRowTopPadding() const {
+  // Harmony does not use the extra padding.
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
+    return 0;
+
   int spacing = button_row_insets_.top();
   // Some subclasses of DialogClientView, in order to do their own layout, set
   // button_row_insets_ to gfx::Insets(). To avoid breaking behavior of those