Allow dialogs to use a custom View as their title.

ui/views/bubble/bubble_frame_view.h

 // 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.
 
 #ifndef UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/window/non_client_view.h"
 
-namespace gfx {
-class FontList;
-}
-
 namespace views {
 
-class Label;
 class BubbleBorder;
 class ImageView;
 
 // The non-client frame view of bubble-styled widgets.
 class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView,
                                      public ButtonListener {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   BubbleFrameView(const gfx::Insets& title_margins,
                   const gfx::Insets& content_margins);
   ~BubbleFrameView() override;
 
+  static std::unique_ptr<Label> CreateDefaultTitleLabel(
+      const base::string16& title_text);
+
   // Creates a close button used in the corner of the dialog.
   static Button* CreateCloseButton(ButtonListener* listener);
 
   // NonClientFrameView:
   gfx::Rect GetBoundsForClientView() const override;
   gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const override;
   bool GetClientMask(const gfx::Size& size, gfx::Path* path) const override;
   int NonClientHitTest(const gfx::Point& point) override;
   void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
   void ResetWindowControls() override;
   void UpdateWindowIcon() override;
   void UpdateWindowTitle() override;
   void SizeConstraintsChanged() override;
 
-  // Set the FontList to be used for the title of the bubble.
-  // Caller must arrange to update the layout to have the call take effect.
-  void SetTitleFontList(const gfx::FontList& font_list);
+  // Sets a custom view to be the dialog title instead of the |default_title_|
+  // label. The title view is owned by this BubbleFrameView. If there is an
+  // existing title view it will be deleted.
+  void SetTitleView(View* title_view);

[sky, 2017/06/22 14:48:48]

Please add test coverage of this. Maybe that setting it and forcing a layout
results in a valid parent, the view being visible and with some non-empty
bounds.

[Bret, 2017/06/22 22:18:30]

See the change in bubble_dialog_delegate_unittest.cc. Added an assert for the
title view's parent. The title view being visible is up to the delegate, so I
didn't assert that.

 
   // View:
   const char* GetClassName() const override;
   gfx::Insets GetInsets() const override;
   gfx::Size CalculatePreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
   void Layout() override;
   void OnPaint(gfx::Canvas* canvas) override;
   void PaintChildren(const ui::PaintContext& context) override;
@@ skipping 30 matching lines @@
 
   bool IsCloseButtonVisible() const;
   gfx::Rect GetCloseButtonMirroredBounds() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewTest, GetBoundsForClientView);
   FRIEND_TEST_ALL_PREFIXES(BubbleFrameViewTest, RemoveFootnoteView);
   FRIEND_TEST_ALL_PREFIXES(BubbleDelegateTest, CloseReasons);
   FRIEND_TEST_ALL_PREFIXES(BubbleDialogDelegateTest, CloseMethods);
 
+  const View* title() const {
+    return delegate_title_ ? delegate_title_ : default_title_;
+  }
+  View* title() {
+    return const_cast<View*>(
+        static_cast<const BubbleFrameView*>(this)->title());

[sky, 2017/06/22 14:48:48]

static_cast -> const_cast

[Peter Kasting, 2017/06/22 17:49:34]

The Meyers pattern is to use static_cast here, which I kind of agree with --
static_cast is basically the "safest" cast.

+  }
+
   // Mirrors the bubble's arrow location on the |vertical| or horizontal axis,
   // if the generated window bounds don't fit in the monitor bounds.
   void MirrorArrowIfOffScreen(bool vertical,
                               const gfx::Rect& anchor_rect,
                               const gfx::Size& client_size);
 
   // Adjust the bubble's arrow offsets if the generated window bounds don't fit
   // in the monitor bounds.
   void OffsetArrowIfOffScreen(const gfx::Rect& anchor_rect,
                               const gfx::Size& client_size);
 
   // Calculates the size needed to accommodate the given client area.
   gfx::Size GetSizeForClientSize(const gfx::Size& client_size) const;
 
   // The bubble border.
   BubbleBorder* bubble_border_;
 
   // Margins around the title label.
   gfx::Insets title_margins_;
 
   // Margins between the content and the inside of the border, in pixels.
   gfx::Insets content_margins_;
 
   // The optional title icon, title, and (x) close button.
   views::ImageView* title_icon_;
-  Label* title_;
+  Label* default_title_;

[sky, 2017/06/22 14:48:48]

It's quite subtle why there are two titles. Please document what the two are for
and when they are used.

[Bret, 2017/06/22 22:18:30]

Done.

+  View* delegate_title_;

[sky, 2017/06/22 14:48:48]

Why did you go with 'delegate' as the prefix for this? The title doesn't come
from the delegate, so it's mildly confusing. Maybe client_title_?

[Bret, 2017/06/22 22:18:30]

It was more associated with the delegate in the earlier versions of the patch
with CreateTitleView. How about "custom_title_"?

   Button* close_;
 
   // A view to contain the footnote view, if it exists.
   View* footnote_container_;
 
   // Whether the close button was clicked.
   bool close_button_clicked_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleFrameView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_FRAME_VIEW_H_