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

ui/views/window/dialog_client_view_unittest.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 "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 41 matching lines @@
     dialog_buttons_ = ui::DIALOG_BUTTON_NONE;
     contents_.reset(new StaticSizedView(gfx::Size(100, 200)));
     client_view_.reset(new TestDialogClientView(contents_.get(), this));
 
     ViewsTestBase::SetUp();
   }
 
   // DialogDelegateView implementation.
   View* GetContentsView() override { return contents_.get(); }
   View* CreateExtraView() override { return extra_view_; }
+  bool GetExtraViewPadding(int* padding) override {
+    if (extra_view_padding_)
+      *padding = *extra_view_padding_;
+    return extra_view_padding_.get() != nullptr;
+  }
   View* CreateFootnoteView() override { return footnote_view_; }
   int GetDialogButtons() const override { return dialog_buttons_; }
 
  protected:
   gfx::Rect GetUpdatedClientBounds() {
     client_view_->SizeToPreferredSize();
     client_view_->Layout();
     return client_view_->bounds();
   }
 
@@ skipping 14 matching lines @@
     client_view_->UpdateDialogButtons();
   }
 
   // Sets the extra view.
   void SetExtraView(View* view) {
     DCHECK(!extra_view_);
     extra_view_ = view;
     client_view_->CreateExtraViews();
   }
 
+  // Sets the extra view padding.
+  void SetExtraViewPadding(int padding) {
+    DCHECK(!extra_view_padding_);
+    extra_view_padding_.reset(new int(padding));
+    client_view_->Layout();
+  }
+
   // Sets the footnote view.
   void SetFootnoteView(View* view) {
     DCHECK(!footnote_view_);
     footnote_view_ = view;
     client_view_->CreateExtraViews();
   }
 
   TestDialogClientView* client_view() { return client_view_.get(); }
 
  private:
   // The contents of the dialog.
   scoped_ptr<View> contents_;
   // The DialogClientView that's being tested.
   scoped_ptr<TestDialogClientView> client_view_;
   // The bitmask of buttons to show in the dialog.
   int dialog_buttons_;
   View* extra_view_;  // weak
+  scoped_ptr<int> extra_view_padding_;  // Null by default.
   View* footnote_view_;  // weak
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientViewTest);
 };
 
 TEST_F(DialogClientViewTest, UpdateButtons) {
   // This dialog should start with no buttons.
   EXPECT_EQ(GetDialogButtons(), ui::DIALOG_BUTTON_NONE);
   EXPECT_EQ(NULL, client_view()->ok_button());
   EXPECT_EQ(NULL, client_view()->cancel_button());
@@ skipping 52 matching lines @@
   SetDialogButtons(ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL);
   CheckContentsIsSetToPreferredSize();
   EXPECT_LT(GetContentsView()->bounds().bottom(),
             client_view()->bounds().bottom());
   gfx::Size no_extra_view_size = client_view()->bounds().size();
 
   View* extra_view = new StaticSizedView(gfx::Size(200, 200));
   SetExtraView(extra_view);
   CheckContentsIsSetToPreferredSize();
   EXPECT_GT(client_view()->bounds().height(), no_extra_view_size.height());
+  int width_of_dialog = client_view()->bounds().width();
   int width_of_extra_view = extra_view->bounds().width();
 
+  // Try with an adjusted padding for the extra view.
+  SetExtraViewPadding(250);
+  CheckContentsIsSetToPreferredSize();
+  EXPECT_GT(client_view()->bounds().width(), width_of_dialog);
+
   // Visibility of extra view is respected.
   extra_view->SetVisible(false);
   CheckContentsIsSetToPreferredSize();
   EXPECT_EQ(no_extra_view_size.height(), client_view()->bounds().height());
   EXPECT_EQ(no_extra_view_size.width(), client_view()->bounds().width());
 
   // Try with a reduced-size dialog.
   extra_view->SetVisible(true);
   client_view()->SetBoundsRect(gfx::Rect(gfx::Point(0, 0), no_extra_view_size));
   client_view()->Layout();
-  DCHECK_GT(width_of_extra_view, extra_view->bounds().width());
+  EXPECT_GT(width_of_extra_view, extra_view->bounds().width());
 }
 
 // Test the effect of the footnote view on layout.
 TEST_F(DialogClientViewTest, LayoutWithFootnote) {
   CheckContentsIsSetToPreferredSize();
   gfx::Size no_footnote_size = client_view()->bounds().size();
 
   View* footnote_view = new StaticSizedView(gfx::Size(200, 200));
   SetFootnoteView(footnote_view);
   CheckContentsIsSetToPreferredSize();
@@ skipping 75 matching lines @@
   // Test that the FocusManager is properly cleared when the DialogClientView is
   // removed from |dialog| during the widget's destruction.
   client_view->set_owned_by_client();
   scoped_ptr<DialogClientView> owned_client_view(client_view);
   toplevel1->CloseNow();
   toplevel2->CloseNow();
   EXPECT_EQ(NULL, owned_client_view->focus_manager_);
 }
 
 }  // namespace views