Allow dialogs to use a custom View as their title.

ui/views/bubble/bubble_dialog_delegate.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 "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_node_data.h"
@@ skipping 88 matching lines @@
 ClientView* BubbleDialogDelegateView::CreateClientView(Widget* widget) {
   DialogClientView* client = new DialogClientView(widget, GetContentsView());
   client->SetButtonRowInsets(gfx::Insets());
   widget->non_client_view()->set_mirror_client_in_rtl(mirror_arrow_in_rtl_);
   return client;
 }
 
 NonClientFrameView* BubbleDialogDelegateView::CreateNonClientFrameView(
     Widget* widget) {
   BubbleFrameView* frame = new BubbleFrameView(title_margins_, margins_);
-  // Note: In CreateBubble, the call to SizeToContents() will cause
-  // the relayout that this call requires.
-  frame->SetTitleFontList(GetTitleFontList());
   frame->SetFootnoteView(CreateFootnoteView());
 
   BubbleBorder::Arrow adjusted_arrow = arrow();
   if (base::i18n::IsRTL() && mirror_arrow_in_rtl_)
     adjusted_arrow = BubbleBorder::horizontal_mirror(adjusted_arrow);
   frame->SetBubbleBorder(std::unique_ptr<BubbleBorder>(
       new BubbleBorder(adjusted_arrow, shadow(), color())));
   return frame;
 }
 
 const char* BubbleDialogDelegateView::GetClassName() const {
   return kViewClassName;
 }
 
+void BubbleDialogDelegateView::AddedToWidget() {
+  SetupTitleView();
+}
+
 void BubbleDialogDelegateView::OnWidgetDestroying(Widget* widget) {
   if (anchor_widget() == widget)
     SetAnchorView(NULL);
 }
 
 void BubbleDialogDelegateView::OnWidgetVisibilityChanging(Widget* widget,
                                                           bool visible) {
 #if defined(OS_WIN)
   // On Windows we need to handle this before the bubble is visible or hidden.
   // Please see the comment on the OnWidgetVisibilityChanging function. On
@@ skipping 91 matching lines @@
 
 gfx::Rect BubbleDialogDelegateView::GetBubbleBounds() {
   // The argument rect has its origin at the bubble's arrow anchor point;
   // its size is the preferred size of the bubble's client view (this view).
   bool anchor_minimized = anchor_widget() && anchor_widget()->IsMinimized();
   return GetBubbleFrameView()->GetUpdatedWindowBounds(
       GetAnchorRect(), GetWidget()->client_view()->GetPreferredSize(),
       adjust_if_offscreen_ && !anchor_minimized);
 }
 
-const gfx::FontList& BubbleDialogDelegateView::GetTitleFontList() const {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    return rb.GetFontListWithDelta(ui::kTitleFontSizeDelta);
-  return rb.GetFontList(ui::ResourceBundle::MediumFont);
+View* BubbleDialogDelegateView::CreateTitleView(
+    const base::string16& title_text) {
+  return nullptr;
+}
+
+void BubbleDialogDelegateView::SetupTitleView() {
+  View* title_view = CreateTitleView(GetWindowTitle());
+  if (title_view)
+    GetBubbleFrameView()->SetTitleView(title_view);
 }
 
 void BubbleDialogDelegateView::OnNativeThemeChanged(
     const ui::NativeTheme* theme) {
   UpdateColorsFromTheme(theme);
 }
 
 void BubbleDialogDelegateView::Init() {}
 
 void BubbleDialogDelegateView::SetAnchorView(View* anchor_view) {
@@ skipping 65 matching lines @@
   // http://crbug.com/474622 for details.
   if (widget == GetWidget() && visible) {
     ui::AXNodeData node_data;
     GetAccessibleNodeData(&node_data);
     if (node_data.role == ui::AX_ROLE_ALERT_DIALOG)
       NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }
 
 }  // namespace views