Chromium Code Reviews| Index: ui/views/bubble/bubble_frame_view.cc |
| diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc |
| index 43bac842f05e438b5a8001e005c41d2ddc20ddbf..87571234e503adb6176141c993e3750be399707e 100644 |
| --- a/ui/views/bubble/bubble_frame_view.cc |
| +++ b/ui/views/bubble/bubble_frame_view.cc |
| @@ -245,7 +245,12 @@ gfx::Insets BubbleFrameView::GetInsets() const { |
| const int title_padding = has_title ? title_margins_.height() : 0; |
| const int title_height = std::max(icon_height, label_height) + title_padding; |
| const int close_height = close_->visible() ? close_->height() : 0; |
| - insets += gfx::Insets(std::max(title_height, close_height), 0, 0, 0); |
| + const int min_height = |
| + !GetWidget()->widget_delegate()->ShouldShowCloseButton() |
|
msw
2016/07/28 18:49:32
This is wrong, numerous cross-platform bubbles and
|
| + ? close_->height() |
| + : 0; |
| + insets += |
| + gfx::Insets(std::max({title_height, close_height, min_height}), 0, 0, 0); |
| return insets; |
| } |