Index: chrome/browser/ui/views/frame/browser_view_layout.cc |
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc |
index dc81ce199cdb35a285c5dbdfb6f087597325b2b3..2d08d230907468433a1437b0b356df59f01bd445 100644 |
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc |
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc |
@@ -173,8 +173,6 @@ gfx::Size BrowserViewLayout::GetMinimumSize() { |
(browser()->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) || |
browser()->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) ? |
toolbar_->GetMinimumSize() : gfx::Size()); |
- if (tabstrip_size.height() && toolbar_size.height()) |
- toolbar_size.Enlarge(0, -GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP)); |
gfx::Size bookmark_bar_size; |
if (bookmark_bar_ && |
bookmark_bar_->visible() && |
@@ -405,8 +403,6 @@ int BrowserViewLayout::LayoutToolbar(int top) { |
int browser_view_width = vertical_layout_rect_.width(); |
bool toolbar_visible = delegate_->IsToolbarVisible(); |
int y = top; |
Peter Kasting
2016/09/22 23:27:24
Nit: Just use |top| directly below
Evan Stade
2016/09/23 00:31:07
Done.
|
- y -= (toolbar_visible && delegate_->IsTabStripVisible()) ? |
- GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP) : 0; |
int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0; |
toolbar_->SetVisible(toolbar_visible); |
toolbar_->SetBounds(vertical_layout_rect_.x(), y, browser_view_width, height); |