Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(641)

Unified Diff: trunk/src/ui/views/window/dialog_delegate.cc

Issue 14765016: Revert 198491 "Render opaque border with no shadow for web conte..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ui/views/window/dialog_delegate.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/window/dialog_delegate.cc
===================================================================
--- trunk/src/ui/views/window/dialog_delegate.cc (revision 198505)
+++ trunk/src/ui/views/window/dialog_delegate.cc (working copy)
@@ -152,25 +152,11 @@
// 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);
- 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));
frame->SetTitle(widget->widget_delegate()->GetWindowTitle());
DialogDelegate* delegate = widget->widget_delegate()->AsDialogDelegate();
if (delegate) {
@@ -180,8 +166,6 @@
}
frame->SetShowCloseButton(true);
frame->set_can_drag(true);
- if (force_opaque_border)
- widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
return frame;
}
« no previous file with comments | « trunk/src/ui/views/window/dialog_delegate.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698