Allow dialogs to use a custom View as their title.

ui/views/bubble/bubble_dialog_delegate_unittest.cc

 // Copyright 2016 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/bubble/bubble_dialog_delegate.h"
 
 #include <stddef.h>
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
+#include "base/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/test/test_views.h"
 #include "ui/views/test/test_widget_observer.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace views {
 
 namespace {
 
 class TestBubbleDialogDelegateView : public BubbleDialogDelegateView {
  public:
   TestBubbleDialogDelegateView(View* anchor_view)
       : BubbleDialogDelegateView(anchor_view, BubbleBorder::TOP_LEFT),
-        view_(new View()) {
+        view_(new View()),
+        title_view_(nullptr) {
     view_->SetFocusBehavior(FocusBehavior::ALWAYS);
     AddChildView(view_);
   }
   ~TestBubbleDialogDelegateView() override {}
 
   // BubbleDialogDelegateView overrides:
   View* GetInitiallyFocusedView() override { return view_; }
   gfx::Size CalculatePreferredSize() const override {
     return gfx::Size(200, 200);
   }
 
+  base::string16 GetWindowTitle() const override {
+    return base::ASCIIToUTF16("TITLE TITLE TITLE");
+  }
+
+  View* CreateTitleView(base::string16 title_text) override {
+    EXPECT_EQ(title_text, GetWindowTitle());
+    return title_view_;
+  }
+
+  void set_title_view(View* title_view) { title_view_ = title_view; }
+  View* title_view() { return title_view_; }
+
   using BubbleDialogDelegateView::SetAnchorRect;
   using BubbleDialogDelegateView::GetBubbleFrameView;
 
  private:
   View* view_;
+  View* title_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBubbleDialogDelegateView);
 };
 
 class BubbleDialogDelegateTest : public ViewsTestBase {
  public:
   BubbleDialogDelegateTest() {}
   ~BubbleDialogDelegateTest() override {}
 
   // Creates and shows a test widget that owns its native widget.
@@ skipping 189 matching lines @@
   TestBubbleDialogDelegateView* bubble_delegate =
       new TestBubbleDialogDelegateView(anchor_widget->GetContentsView());
   BubbleDialogDelegateView::CreateBubble(bubble_delegate);
   BubbleFrameView* frame = bubble_delegate->GetBubbleFrameView();
   const int border = frame->bubble_border()->GetBorderThickness();
 
   struct {
     const int point;
     const int hit;
   } cases[] = {
-      {border, HTNOWHERE}, {border + 50, HTCLIENT}, {1000, HTNOWHERE},
+      {border, HTNOWHERE}, {border + 60, HTCLIENT}, {1000, HTNOWHERE},
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     gfx::Point point(cases[i].point, cases[i].point);
     EXPECT_EQ(cases[i].hit, frame->NonClientHitTest(point))
         << " with border: " << border << ", at point " << cases[i].point;
   }
 }
 
 TEST_F(BubbleDialogDelegateTest, VisibleWhenAnchorWidgetBoundsChanged) {
@@ skipping 61 matching lines @@
     Button* close_button = frame_view->close_;
     ASSERT_TRUE(close_button);
     frame_view->ButtonPressed(
         close_button,
         ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                        ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE));
     EXPECT_TRUE(bubble_widget->IsClosed());
   }
 }
 
+TEST_F(BubbleDialogDelegateTest, CustomTitle) {
+  std::unique_ptr<Widget> anchor_widget(CreateTestWidget());
+  TestBubbleDialogDelegateView* bubble_delegate =
+      new TestBubbleDialogDelegateView(anchor_widget->GetContentsView());
+  constexpr int title_preferred_height = 20;

[Peter Kasting, 2017/06/17 01:16:20]

Nit: Use kNamingStyle

[Bret, 2017/06/21 22:37:54]

Done.

+  View* title_view = new StaticSizedView(gfx::Size(10, title_preferred_height));
+  bubble_delegate->set_title_view(title_view);
+  Widget* bubble_widget =
+      BubbleDialogDelegateView::CreateBubble(bubble_delegate);
+  bubble_widget->Show();
+  // Title takes up the whole bubble width when there's no icon or close button.

[Peter Kasting, 2017/06/17 01:16:20]

Nit: Maybe this means the below statement should be

  EXPECT_EQ(bubble_delegate->width(), title_view->width());

?

[Bret, 2017/06/21 22:37:54]

I split this into two EXPECTs for the width and height, so it's clearer what the
comment goes with.

+  EXPECT_EQ(gfx::Size(bubble_delegate->width(), title_preferred_height),
+            title_view->size());
+}
+
 }  // namespace views