Harmony - convert hung renderer dialog.

ui/views/window/dialog_client_view.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/window/dialog_client_view.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 24 matching lines @@
 const bool kIsOkButtonOnLeftSide = false;
 #endif
 
 // Returns true if the given view should be shown (i.e. exists and is
 // visible).
 bool ShouldShow(View* view) {
   return view && view->visible();
 }
 
 // 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;
 
   const gfx::Size size = button->GetPreferredSize();
   row_bounds->set_width(row_bounds->width() - size.width());
   DCHECK_LE(button_height, row_bounds->height());
   button->SetBounds(
       row_bounds->right(),
       row_bounds->y() + (row_bounds->height() - button_height) / 2,
       size.width(), button_height);
@@ skipping 16 matching lines @@
       extra_view_(nullptr),
       delegate_allowed_close_(false) {
   button_row_insets_ =
       ViewsDelegate::GetInstance()
           ? ViewsDelegate::GetInstance()->GetDialogButtonInsets()
           : gfx::Insets(0, kButtonHEdgeMarginNew, kButtonVEdgeMarginNew,
                         kButtonHEdgeMarginNew);
   // 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() {
 }
 
 void DialogClientView::AcceptWindow() {
   // Only notify the delegate once. See |delegate_allowed_close_|'s comment.
   if (!delegate_allowed_close_ && GetDialogDelegate()->Accept()) {
     delegate_allowed_close_ = true;
     GetWidget()->Close();
@@ skipping 74 matching lines @@
           (cancel_button_ && ok_button_
            ? (ViewsDelegate::GetInstance()
                   ? ViewsDelegate::GetInstance()
                         ->GetDialogRelatedButtonHorizontalSpacing()
                   : kRelatedButtonHSpacing) : 0) +
       (ShouldShow(extra_view_) ? extra_view_->GetPreferredSize().width() : 0) +
       (ShouldShow(extra_view_) && has_dialog_buttons() ? extra_view_padding
                                                        : 0),
       0);
 
-  int buttons_height = GetButtonsAndExtraViewRowHeight();
-  if (buttons_height != 0) {
-    size.Enlarge(0, buttons_height + GetButtonsAndExtraViewRowTopPadding());
+  int buttons_row_height = GetButtonsAndExtraViewRowHeight();
+  if (buttons_row_height != 0) {
+    // Harmony does not use the extra padding.
+    if (!ui::MaterialDesignController::IsSecondaryUiMaterial())
+      buttons_row_height += GetButtonsAndExtraViewRowTopPadding();

[Peter Kasting, 2017/02/02 00:32:30]

Shouldn't this be implemented by returning 0 from
GetButtonsAndExtraViewRowTopPadding() instead?

[Bret, 2017/02/03 01:47:17]

Done.

+    size.Enlarge(0, buttons_row_height);
     // Inset the buttons and extra view.
     const gfx::Insets insets = GetButtonRowInsets();
     size.Enlarge(insets.width(), insets.height());
   }
 
   // Increase the size as needed to fit the contents view.
   // NOTE: The contents view is not inset on the top or side client view edges.
   gfx::Size contents_size = contents_view()->GetPreferredSize();
   size.Enlarge(0, contents_size.height());
   size.set_width(std::max(size.width(), contents_size.width()));
@@ skipping 24 matching lines @@
     }
     if (extra_view_) {
       int custom_padding = 0;
       if (has_dialog_buttons() &&
           GetDialogDelegate()->GetExtraViewPadding(&custom_padding)) {
         // The call to LayoutButton() will already have accounted for some of
         // the padding.
         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);
+      } else {
+        row_bounds.set_width(std::min(row_bounds.width(),
+                                      extra_view_->GetPreferredSize().width()));
+        extra_view_->SetBoundsRect(row_bounds);
+      }
     }
 
     if (height > 0)
       bounds.Inset(0, 0, 0, height + GetButtonsAndExtraViewRowTopPadding());
   }
 
   // Layout the contents view to the top and side edges of the contents bounds.
   // NOTE: The local insets do not apply to the contents view sides or top.
   const gfx::Rect contents_bounds = GetContentsBounds();
   contents_view()->SetBounds(contents_bounds.x(), contents_bounds.y(),
@@ skipping 98 matching lines @@
        PlatformStyle::kDialogDefaultButtonCanBeCancel);
 
   // The default button is always blue in Harmony.
   if (is_default && (ui::MaterialDesignController::IsSecondaryUiMaterial() ||
                      GetDialogDelegate()->ShouldDefaultButtonBeBlue())) {
     button = MdTextButton::CreateSecondaryUiBlueButton(this, title);
   } else {
     button = MdTextButton::CreateSecondaryUiButton(this, title);
   }
 
-  const int kDialogMinButtonWidth = 75;
-  button->SetMinSize(gfx::Size(kDialogMinButtonWidth, 0));
+  const int minimum_button_width =
+      ViewsDelegate::GetInstance()
+          ? ViewsDelegate::GetInstance()->GetDialogButtonMinimumWidth()
+          : kDialogMinimumButtonWidth;
+  button->SetMinSize(gfx::Size(minimum_button_width, 0));
   button->SetGroup(kButtonGroup);
   return button;
 }
 
 int DialogClientView::GetButtonHeight() const {
   return std::max(
       ok_button_ ? ok_button_->GetPreferredSize().height() : 0,
       cancel_button_ ? cancel_button_->GetPreferredSize().height() : 0);
 }
 
@@ skipping 43 matching lines @@
       std::remove(child_views.begin(), child_views.end(), nullptr),
       child_views.end());
 
   // Setup focus by reordering views. It is not safe to use SetNextFocusableView
   // since child views may be added externally to this view.
   for (size_t i = 0; i < child_views.size(); i++)
     ReorderChildView(child_views[i], i);
 }
 
 }  // namespace views