Allow dialogs to use a custom View as their title.

chrome/browser/ui/views/page_info/page_info_bubble_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 "chrome/browser/ui/views/page_info/page_info_bubble_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 27 matching lines @@
 #include "extensions/common/constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #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"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/view.h"
@@ skipping 370 matching lines @@
     views::View* anchor_view,
     gfx::NativeView parent_window,
     Profile* profile,
     content::WebContents* web_contents,
     const GURL& url,
     const security_state::SecurityInfo& security_info)
     : content::WebContentsObserver(web_contents),
       BubbleDialogDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT),
       profile_(profile),
       header_(nullptr),
+      title_(nullptr),
       separator_(nullptr),
       site_settings_view_(nullptr),
       cookie_dialog_link_(nullptr),
       permissions_view_(nullptr),
       weak_factory_(this) {
   g_shown_bubble_type = BUBBLE_PAGE_INFO;
   g_page_info_bubble = this;
   set_parent_window(parent_window);
 
   // Compensate for built-in vertical padding in the anchor view's image.
@@ skipping 79 matching lines @@
 
 void PageInfoBubbleView::OnChosenObjectDeleted(
     const PageInfoUI::ChosenObjectInfo& info) {
   presenter_->OnSiteChosenObjectDeleted(info.ui_info, *info.object);
 }
 
 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;
 }
 
 void PageInfoBubbleView::OnWidgetDestroying(views::Widget* widget) {
   g_shown_bubble_type = BUBBLE_NONE;
   g_page_info_bubble = nullptr;
   presenter_->OnUIClosing();
 }
 
 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());
   GetWidget()->Close();
 }
 
 void PageInfoBubbleView::LinkClicked(views::Link* source, int event_flags) {
   // The bubble closes automatically when the collected cookies dialog or the
   // certificate viewer opens. So delay handling of the link clicked to avoid
   // a crash in the base class which needs to complete the mouse event handling.
@@ skipping 109 matching lines @@
   site_settings_view_->AddChildView(link_section);
 
   SizeToContents();
 }
 
 void PageInfoBubbleView::SetIdentityInfo(const IdentityInfo& identity_info) {
   std::unique_ptr<PageInfoUI::SecurityDescription> security_description =
       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;
 
     if (identity_info.show_ssl_decision_revoke_button)
       header_->AddResetDecisionsLabel();
 
     if (PageInfoUI::ShouldShowCertificateLink()) {
       // The text of link to the Certificate Viewer varies depending on the
       // validity of the Certificate.
@@ skipping 99 matching lines @@
           PageInfo::PAGE_INFO_CONNECTION_HELP_OPENED);
       break;
     case VIEW_ID_PAGE_INFO_LABEL_RESET_CERTIFICATE_DECISIONS:
       presenter_->OnRevokeSSLErrorBypassButtonPressed();
       GetWidget()->Close();
       break;
     default:
       NOTREACHED();
   }
 }