[Views] Allow dialog delegates to use a custom padding for the extra view

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 "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/background.h"
@@ skipping 159 matching lines @@
 
 void DialogClientView::OnDidChangeFocus(View* focused_before,
                                         View* focused_now) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, View overrides:
 
 gfx::Size DialogClientView::GetPreferredSize() const {
   // Initialize the size to fit the buttons and extra view row.
+  int extra_view_padding = 0;
+  if (!GetDialogDelegate()->GetExtraViewPadding(&extra_view_padding))
+    extra_view_padding = kRelatedButtonHSpacing;
   gfx::Size size(
       (ok_button_ ? ok_button_->GetPreferredSize().width() : 0) +
       (cancel_button_ ? cancel_button_->GetPreferredSize().width() : 0) +
       (cancel_button_ && ok_button_ ? kRelatedButtonHSpacing : 0) +
       (ShouldShow(extra_view_) ? extra_view_->GetPreferredSize().width() : 0) +
       (ShouldShow(extra_view_) && has_dialog_buttons() ?
-           kRelatedButtonHSpacing : 0),
+           extra_view_padding : 0),
       0);
 
   int buttons_height = GetButtonsAndExtraViewRowHeight();
   if (buttons_height != 0) {
     size.Enlarge(0, buttons_height + kRelatedControlVerticalSpacing);
     // Inset the buttons and extra view.
     const gfx::Insets insets = GetButtonRowInsets();
     size.Enlarge(insets.width(), insets.height());
   }
 
@@ skipping 35 matching lines @@
     gfx::Rect row_bounds(bounds.x(), bounds.bottom() - height,
                          bounds.width(), height);
     if (kIsOkButtonOnLeftSide) {
       LayoutButton(cancel_button_, &row_bounds);
       LayoutButton(ok_button_, &row_bounds);
     } else {
       LayoutButton(ok_button_, &row_bounds);
       LayoutButton(cancel_button_, &row_bounds);
     }
     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 -= kRelatedButtonHSpacing;
+        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 (height > 0)
       bounds.Inset(0, 0, 0, height + kRelatedControlVerticalSpacing);
   }
 
   // Layout the contents view to the top and side edges of the contents bounds.
@@ skipping 167 matching lines @@
       gfx::Insets(0, kButtonHEdgeMarginNew,
                   kButtonVEdgeMarginNew, kButtonHEdgeMarginNew);
 }
 
 void DialogClientView::Close() {
   GetWidget()->Close();
   GetDialogDelegate()->OnClosed();
 }
 
 }  // namespace views