Index: ui/views/window/dialog_delegate.cc |
=================================================================== |
--- ui/views/window/dialog_delegate.cc (revision 239915) |
+++ ui/views/window/dialog_delegate.cc (working copy) |
@@ -154,34 +154,18 @@ |
// static |
NonClientFrameView* DialogDelegate::CreateDialogFrameView(Widget* widget) { |
- return CreateDialogFrameView(widget, false); |
-} |
- |
-// static |
-NonClientFrameView* DialogDelegate::CreateDialogFrameView( |
- 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->SetBubbleBorder(new BubbleBorder(BubbleBorder::FLOAT, |
+ BubbleBorder::SMALL_SHADOW, |
+ color)); |
DialogDelegate* delegate = widget->widget_delegate()->AsDialogDelegate(); |
if (delegate) { |
View* titlebar_view = delegate->CreateTitlebarExtraView(); |
if (titlebar_view) |
frame->SetTitlebarExtraView(titlebar_view); |
} |
- if (force_opaque_border) |
- widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM); |
#if defined(USE_AURA) |
Mike Wittman
2013/12/11 15:09:18
Remove this also.
msw
2013/12/11 17:47:13
We are trying to avoid breaking non-Aura Win until
|
// TODO(msw): Add a matching shadow type and remove the bubble frame border? |
corewm::SetShadowType(widget->GetNativeWindow(), corewm::SHADOW_TYPE_NONE); |