Index: chrome/browser/ui/views/frame/browser_view.cc |
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
index 13996a4855329f55eb0c95519a25d104c25dcc1c..bcc59cae232d87d5a5e7b3287310d2793a501b52 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.cc |
+++ b/chrome/browser/ui/views/frame/browser_view.cc |
@@ -2007,12 +2007,21 @@ std::string BrowserView::GetClassName() const { |
void BrowserView::Layout() { |
if (ignore_layout_) |
return; |
+ |
+ int prev_content_height = contents_container_->height(); |
+ |
views::View::Layout(); |
// The status bubble position requires that all other layout finish first. |
LayoutStatusBubble(); |
MaybeStackBookmarkBarAtTop(); |
+ |
+ if (browser_->instant_controller() && |
+ prev_content_height != contents_container_->height()) { |
+ browser_->instant_controller()->SetContentHeight( |
+ contents_container_->height()); |
+ } |
} |
void BrowserView::PaintChildren(gfx::Canvas* canvas) { |