Allow dialogs to use a custom View as their title.

ui/views/window/dialog_delegate_unittest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_processor.h"
@@ skipping 306 matching lines @@
 
   // Giving the default test dialog a title will yield the same bounds.
   dialog()->set_title(base::ASCIIToUTF16("Title"));
   dialog()->GetWidget()->UpdateWindowTitle();
   EXPECT_EQ(frame1->GetPreferredSize().height(),
             frame2->GetPreferredSize().height());
 
   dialog2->TearDown();
 }
 
+TEST_F(DialogTest, ActualBoundsMatchPreferredBounds) {
+  dialog()->set_title(base::ASCIIToUTF16(
+      "La la la look at me I'm a really really long title that needs to be "
+      "really really long so that the title will multiline wrap."));
+  dialog()->GetWidget()->UpdateWindowTitle();
+
+  views::View* root_view = dialog()->GetWidget()->GetRootView();
+  gfx::Size preferred_size(root_view->GetPreferredSize());
+  EXPECT_FALSE(preferred_size.IsEmpty());
+  root_view->SizeToPreferredSize();
+  root_view->Layout();
+  EXPECT_EQ(preferred_size, root_view->size());
+}
+
 // Tests default focus is assigned correctly when showing a new dialog.
 TEST_F(DialogTest, InitialFocus) {
   EXPECT_TRUE(dialog()->input()->HasFocus());
   EXPECT_EQ(dialog()->input(), dialog()->GetFocusManager()->GetFocusedView());
 }
 
 // A dialog for testing initial focus with only an OK button.
 class InitialFocusTestDialog : public DialogDelegateView {
  public:
   InitialFocusTestDialog() {}
@@ skipping 66 matching lines @@
 }
 
 TEST_F(DialogTest, DontSnapWithoutButtons) {
   TestDialog dialog;
   EXPECT_TRUE(dialog.ShouldSnapFrameWidth());
   dialog.set_dialog_buttons(ui::DIALOG_BUTTON_NONE);
   EXPECT_FALSE(dialog.ShouldSnapFrameWidth());
 }
 
 }  // namespace views