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 25e1df6b6d8d3b6e3c148714c50aaaf04886a159..94e8ae1182c7284697321c9574f8b22cd728fb4d 100644 |
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc |
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc |
@@ -186,7 +186,7 @@ gfx::Size BrowserViewLayout::GetMinimumSize() { |
gfx::Size contents_size(contents_container_->GetMinimumSize()); |
- int min_height = delegate_->GetTopInsetInBrowserView() + |
+ int min_height = delegate_->GetTopInsetInBrowserView(false) + |
tabstrip_size.height() + toolbar_size.height() + |
bookmark_bar_size.height() + infobar_container_size.height() + |
contents_size.height(); |
@@ -318,13 +318,13 @@ int BrowserViewLayout::NonClientHitTest(const gfx::Point& point) { |
void BrowserViewLayout::Layout(views::View* browser_view) { |
vertical_layout_rect_ = browser_view->GetLocalBounds(); |
- int top = delegate_->GetTopInsetInBrowserView(); |
+ int top = delegate_->GetTopInsetInBrowserView(false); |
top = LayoutTabStripRegion(top); |
if (delegate_->IsTabStripVisible()) { |
int x = tab_strip_->GetMirroredX() + |
browser_view_->GetMirroredX() + |
delegate_->GetThemeBackgroundXInset(); |
- int y = browser_view_->y() + delegate_->GetTopInsetInBrowserView(); |
+ int y = browser_view_->y() + delegate_->GetTopInsetInBrowserView(true); |
sky
2015/11/06 16:49:48
This looks so wrong. 321 supplies false, and this
Peter Kasting
2015/11/06 22:04:03
Sure, will add.
In brief, the summary is:
* "fals
|
tab_strip_->SetBackgroundOffset(gfx::Point(x, y)); |
} |
top = LayoutToolbar(top); |
@@ -499,7 +499,7 @@ void BrowserViewLayout::UpdateTopContainerBounds() { |
// Ensure that the top container view reaches the topmost view in the |
// ClientView because the bounds of the top container view are used in |
// layout and we assume that this is the case. |
- height = std::max(height, delegate_->GetTopInsetInBrowserView()); |
+ height = std::max(height, delegate_->GetTopInsetInBrowserView(false)); |
gfx::Rect top_container_bounds(vertical_layout_rect_.width(), height); |