Fix BubbleFrameView title and close button patterns.

ui/views/window/dialog_delegate.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 "ui/views/window/dialog_delegate.h"
 
 #include "base/logging.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/ui_base_switches_util.h"
@@ skipping 72 matching lines @@
 
 bool DialogDelegate::Accept() {
   return true;
 }
 
 base::string16 DialogDelegate::GetDialogLabel() const {
   return base::string16();
 }
 
 base::string16 DialogDelegate::GetDialogTitle() const {
-  return base::string16();
+  return GetWindowTitle();
 }
 
 int DialogDelegate::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 }
 
 int DialogDelegate::GetDefaultDialogButton() const {
   if (GetDialogButtons() & ui::DIALOG_BUTTON_OK)
     return ui::DIALOG_BUTTON_OK;
   if (GetDialogButtons() & ui::DIALOG_BUTTON_CANCEL)
@@ skipping 54 matching lines @@
   if (UseNewStyleForThisDialog())
     return CreateNewStyleFrameView(widget);
   return WidgetDelegate::CreateNonClientFrameView(widget);
 }
 
 // static
 NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
   return CreateNewStyleFrameView(widget, false);
 }
 
+// static
 NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(
     Widget* widget,
     bool force_opaque_border) {
   BubbleFrameView* frame = new BubbleFrameView(gfx::Insets());
   const SkColor color = widget->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground);
   if (force_opaque_border) {
     frame->SetBubbleBorder(new BubbleBorder(
         BubbleBorder::NONE,
         BubbleBorder::NO_SHADOW_OPAQUE_BORDER,
         color));
   } else {
     frame->SetBubbleBorder(new BubbleBorder(BubbleBorder::FLOAT,
                                             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;
 }
 
 bool DialogDelegate::UseNewStyleForThisDialog() const {
   return UseNewStyle();
 }
 
 const DialogClientView* DialogDelegate::GetDialogClientView() const {
@@ skipping 28 matching lines @@
 
 const Widget* DialogDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 View* DialogDelegateView::GetContentsView() {
   return this;
 }
 
 }  // namespace views