Chromium Code Reviews| Index: chrome/browser/ui/views/toolbar/toolbar_view.cc |
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc |
| index 2ec85da4f119779bfbadd2dee768010ffcf6c14b..b4ccf3ede684d2879495085d2107c9cab1bd9733 100644 |
| --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc |
| +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc |
| @@ -699,6 +699,9 @@ void ToolbarView::UpdateBadgeSeverity(AppMenuBadgeController::BadgeType type, |
| } |
| int ToolbarView::PopupTopSpacing() const { |
| + if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) |
| + return 0; |
| + |
| const int kAdditionalPopupTopSpacingNonGlass = 2; |
| return views::NonClientFrameView::kClientEdgeThickness + |
| (GetWidget()->ShouldWindowContentsBeTransparent() ? |
| @@ -746,14 +749,7 @@ gfx::Size ToolbarView::SizeForContentSize(gfx::Size size) const { |
| size.SetToMax( |
| gfx::Size(0, normal_background->height() - content_shadow_height())); |
| } |
| - } else if (size.height() == 0) { |
| - // Location mode with a 0 height location bar. If on ash, expand by one |
| - // pixel to show a border in the title bar, otherwise leave the size as zero |
| - // height. |
| - const int kAshBorderSpacing = 1; |
| - if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) |
|
tdanderson
2016/01/29 22:28:43
This change makes the frame header flush with the
Peter Kasting
2016/01/30 02:53:37
That sounds like a bug where views is not sending
tdanderson
2016/02/01 22:17:51
Still looking into this.
tdanderson
2016/02/02 19:22:36
Turns out this was a recent regression unrelated t
|
| - size.Enlarge(0, kAshBorderSpacing); |
| - } else { |
| + } else if (size.height() > 0) { |
| size.Enlarge( |
| 0, PopupTopSpacing() + views::NonClientFrameView::kClientEdgeThickness); |
| } |