Allow dialogs to use a custom View as their title.

chrome/browser/ui/views/page_info/page_info_bubble_view.cc

Index: chrome/browser/ui/views/page_info/page_info_bubble_view.cc
diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
index 645b9fa845bad28c89d3308343f6f3eeadb88520..2a52212559f2562babc0864b190bc559d4ca5cbe 100644
--- a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view.cc
@@ -45,6 +45,7 @@
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/border.h"
+#include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/image_view.h"
@@ -435,6 +436,7 @@ PageInfoBubbleView::PageInfoBubbleView(
       BubbleDialogDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT),
       profile_(profile),
       header_(nullptr),
+      title_(nullptr),
       separator_(nullptr),
       site_settings_view_(nullptr),
       cookie_dialog_link_(nullptr),
@@ -534,6 +536,15 @@ base::string16 PageInfoBubbleView::GetWindowTitle() const {
   return summary_text_;
 }
 
+void PageInfoBubbleView::AddedToWidget() {
+  title_ = views::BubbleFrameView::CreateDefaultTitleLabel(GetWindowTitle())
+               .release();
+  title_->SetFontList(
+      ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
+          kSummaryFontSizeDelta));
+  GetBubbleFrameView()->SetTitleView(title_);

[Peter Kasting, 2017/06/23 06:00:09]

SetTitleView() basically "takes ownership" of this object -- it will handle
deleting it.

I think we should have it take a unique_ptr to make that clear.  You might want
to implement the comment below as a prerequisite to this, since it's awkward to
keep a raw pointer to something you've passed away ownership to.  (It's just as
unsafe in the current design, but passing ownership more explicitly makes the
awkwardness more obvious.)  Maybe this provides enough motivation to actually
implement that comment instead of saying "eh" :)

[Bret, 2017/06/24 01:12:33]

Done.

+}
+
 bool PageInfoBubbleView::ShouldShowCloseButton() const {
   return true;
 }
@@ -548,11 +559,6 @@ int PageInfoBubbleView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
-const gfx::FontList& PageInfoBubbleView::GetTitleFontList() const {
-  return ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
-      kSummaryFontSizeDelta);
-}
-
 void PageInfoBubbleView::ButtonPressed(views::Button* button,
                                        const ui::Event& event) {
   DCHECK_EQ(VIEW_ID_PAGE_INFO_BUTTON_CLOSE, button->id());
@@ -682,7 +688,7 @@ void PageInfoBubbleView::SetIdentityInfo(const IdentityInfo& identity_info) {
       identity_info.GetSecurityDescription();
 
   summary_text_ = security_description->summary;
-  GetWidget()->UpdateWindowTitle();
+  title_->SetText(GetWindowTitle());

[Peter Kasting, 2017/06/23 06:00:09]

If the BubbleFrameView exposed the title() methods publicly, this could call
them, which would remove the need to keep it as a member.  OTOH, you'd have to
cast the returned pointer, which you know is safe, but might look scary/awkward.

[Bret, 2017/06/24 01:12:32]

The new patchset has this version. I'm not sure which I prefer, the scary
ownership passing or the scary downcasting. What do you think?

 
   if (identity_info.certificate) {
     certificate_ = identity_info.certificate;