| Index: ui/views/window/dialog_delegate.cc
|
| diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
|
| index a6f2732c388135ed834a6f388f69402992857f01..e1272d1e81358e4d8e93cbacfb0172963f43abb1 100644
|
| --- a/ui/views/window/dialog_delegate.cc
|
| +++ b/ui/views/window/dialog_delegate.cc
|
| @@ -152,11 +152,25 @@ NonClientFrameView* DialogDelegate::CreateNonClientFrameView(Widget* widget) {
|
|
|
| // static
|
| NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
|
| + return CreateNewStyleFrameView(widget, false);
|
| +}
|
| +
|
| +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);
|
| - frame->SetBubbleBorder(
|
| - new BubbleBorder(BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW, color));
|
| + 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) {
|
| @@ -166,6 +180,8 @@ NonClientFrameView* DialogDelegate::CreateNewStyleFrameView(Widget* widget) {
|
| }
|
| frame->SetShowCloseButton(true);
|
| frame->set_can_drag(true);
|
| + if (force_opaque_border)
|
| + widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
|
| return frame;
|
| }
|
|
|
|
|