alternate ntp: fix content origin when overlay shrinks to shorter than top bars

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_finder.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
@@ skipping 321 matching lines @@
 
   int bottom = LayoutDownloadShelf(browser_view_->height());
   int active_top_margin = GetTopMarginForActiveContent();
   top -= active_top_margin;
   contents_container_->SetActiveTopMargin(active_top_margin);
   LayoutTabContents(top, bottom);
 
   // Now set the contents to display at their previous origin if we just hid the
   // bookmark and/or infobars.
   if (active_top_margin == 0 && !old_contents_origin.IsOrigin()) {
+    // Retrieve the overlay height again since it may have changed in layouts
+    // triggered in LayoutTabContents().
+    overlay_height = contents_container_->overlay_height();
+    // Get the new origin of contents.
     gfx::Point new_contents_origin(contents->bounds().origin());
     views::View::ConvertPointToTarget(contents->parent(), browser_view_,
                                       &new_contents_origin);
     active_top_margin = old_contents_origin.y() - new_contents_origin.y();
     // Special case: While normally the suggestions appear to "cover" any
     // bookmark/infobars, if the suggestions are very short, they might not
     // fully cover that gap, and leaving the contents at their original height
     // would leave an odd-looking blank space.  In this case, we allow the
     // contents to go ahead and shift upward.
     if (active_top_margin > 0 && active_top_margin < overlay_height)
@@ skipping 230 matching lines @@
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   views::View* infobar_container = browser_view_->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);
 }