| Index: ui/views/window/dialog_delegate.cc
|
| diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
|
| index 265dbbd021291f1002b0cae41a465d52b83c1a4d..ef80f818a99dd6a80cbc3099ee5a95a3c10ca30f 100644
|
| --- a/ui/views/window/dialog_delegate.cc
|
| +++ b/ui/views/window/dialog_delegate.cc
|
| @@ -90,7 +90,7 @@ base::string16 DialogDelegate::GetDialogLabel() const {
|
| }
|
|
|
| base::string16 DialogDelegate::GetDialogTitle() const {
|
| - return base::string16();
|
| + return GetWindowTitle();
|
| }
|
|
|
| int DialogDelegate::GetDialogButtons() const {
|
| @@ -165,6 +165,7 @@ NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
|
| return CreateNewStyleFrameView(widget, false);
|
| }
|
|
|
| +// static
|
| NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(
|
| Widget* widget,
|
| bool force_opaque_border) {
|
| @@ -181,14 +182,12 @@ NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(
|
| BubbleBorder::SMALL_SHADOW,
|
| color));
|
| }
|
| - frame->SetTitle(widget->widget_delegate()->GetWindowTitle());
|
| DialogDelegate* delegate = widget->widget_delegate()->AsDialogDelegate();
|
| if (delegate) {
|
| View* titlebar_view = delegate->CreateTitlebarExtraView();
|
| if (titlebar_view)
|
| frame->SetTitlebarExtraView(titlebar_view);
|
| }
|
| - frame->SetShowCloseButton(widget->widget_delegate()->ShouldShowCloseButton());
|
| if (force_opaque_border)
|
| widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
|
| return frame;
|
|
|