Replace DialogFrameView with an enhanced BubbleFrameView.

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/command_line.h"
 #include "base/logging.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/views/bubble/bubble_border.h"
+#include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_client_view.h"
-#include "ui/views/window/dialog_frame_view.h"
 
 namespace views {
 
 namespace {
 
 // Create a widget to host the dialog.
 Widget* CreateDialogWidgetImpl(DialogDelegateView* dialog_delegate_view,
                                gfx::NativeWindow context,
                                gfx::NativeWindow parent) {
   views::Widget* widget = new views::Widget;
@@ skipping 100 matching lines @@
 
 DialogDelegate* DialogDelegate::AsDialogDelegate() {
   return this;
 }
 
 ClientView* DialogDelegate::CreateClientView(Widget* widget) {
   return new DialogClientView(widget, GetContentsView());
 }
 
 NonClientFrameView* DialogDelegate::CreateNonClientFrameView(Widget* widget) {
-  return UseNewStyle() ? new DialogFrameView(GetWindowTitle()) :
-      WidgetDelegate::CreateNonClientFrameView(widget);
+  return UseNewStyle() ? CreateNewStyleFrameView(widget) :
+                         WidgetDelegate::CreateNonClientFrameView(widget);
+}
+
+// static
+NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
+  BubbleFrameView* frame = new BubbleFrameView(gfx::Insets(20, 20, 20, 20));
+  const SkColor color = widget->GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_DialogBackground);
+  frame->SetBubbleBorder(
+      new BubbleBorder(BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW, color));
+  frame->SetTitle(widget->widget_delegate()->GetWindowTitle());
+  frame->SetShowCloseButton(true);
+  frame->set_can_drag(true);
+  return frame;
 }
 
 const DialogClientView* DialogDelegate::GetDialogClientView() const {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
 DialogClientView* DialogDelegate::GetDialogClientView() {
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
@@ skipping 28 matching lines @@
 
 const Widget* DialogDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 View* DialogDelegateView::GetContentsView() {
   return this;
 }
 
 }  // namespace views