Redo display of web contents modal dialog under the bookmark bar

chrome/browser/ui/views/frame/browser_view_layout.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 315 matching lines @@
   int top = LayoutTabStripRegion(browser_view);
   if (delegate_->IsTabStripVisible()) {
     int x = tab_strip_->GetMirroredX() +
         browser_view_->GetMirroredX() +
         browser_view_->frame()->GetThemeBackgroundXInset();
     tab_strip_->SetBackgroundOffset(
         gfx::Point(x, browser_view_->frame()->GetTabStripInsets(false).top));
   }
   top = LayoutToolbar(top);
 
-  web_contents_modal_dialog_top_y_ =
-      top + browser_view->y() - kConstrainedWindowOverlap;
-
   // Overlay container requires updated toolbar bounds to determine its
   // position, and needs to be laid out before:
   // - GetTopMarginForActiveContent(), which calls GetInstantUIState() to check
   //   if overlay container is visible
   // - LayoutInfoBar(): children of infobar container will layout and call
   //   BrowserView::DrawInfoBarArrows(), which checks if overlay container is
   //   visible.
   LayoutOverlayContainer();
 
-  top = LayoutBookmarkAndInfoBars(top);
+  top = LayoutBookmarkAndInfoBars(top, browser_view->y());
 
   // Top container requires updated toolbar and bookmark bar to compute size.
   top_container_->SetSize(top_container_->GetPreferredSize());
 
   int bottom = LayoutDownloadShelf(browser_view->height());
   // Treat a detached bookmark bar as if the web contents container is shifted
   // upwards and overlaps it.
   top -= GetContentsOffsetForBookmarkBar();
   LayoutContentsSplitView(top, bottom);
 
@@ skipping 83 matching lines @@
   int y = top;
   y -= (toolbar_visible && delegate_->IsTabStripVisible()) ?
         kToolbarTabStripVerticalOverlap : 0;
   int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
   toolbar_->SetVisible(toolbar_visible);
   toolbar_->SetBounds(vertical_layout_rect_.x(), y, browser_view_width, height);
 
   return y + height;
 }
 
-int BrowserViewLayout::LayoutBookmarkAndInfoBars(int top) {
+int BrowserViewLayout::LayoutBookmarkAndInfoBars(int top, int browser_view_y) {
   if (bookmark_bar_) {
     // If we're showing the Bookmark bar in detached style, then we
     // need to show any Info bar _above_ the Bookmark bar, since the
     // Bookmark bar is styled to look like it's part of the page.
-    if (bookmark_bar_->IsDetached())
+    if (bookmark_bar_->IsDetached()) {
+      web_contents_modal_dialog_top_y_ =
+          top + browser_view_y - kConstrainedWindowOverlap;
       return LayoutBookmarkBar(LayoutInfoBar(top));
+    }
     // Otherwise, Bookmark bar first, Info bar second.
     top = std::max(toolbar_->bounds().bottom(), LayoutBookmarkBar(top));
   }
+
+  web_contents_modal_dialog_top_y_ =
+      top + browser_view_y - kConstrainedWindowOverlap;
+
   return LayoutInfoBar(top);
 }
 
 int BrowserViewLayout::LayoutBookmarkBar(int top) {
   int y = top;
   if (!delegate_->IsBookmarkBarVisible()) {
     bookmark_bar_->SetVisible(false);
     // TODO(jamescook): Don't change the bookmark bar height when it is
     // invisible, so we can use its height for layout even in that state.
     bookmark_bar_->SetBounds(0, y, browser_view_->width(), 0);
@@ skipping 141 matching lines @@
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // Cast to a views::View to access GetPreferredSize().
   views::View* infobar_container = infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }