alternate ntp: tweaks and fixes for bookmark bar in ntp

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

 // Copyright (c) 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 "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/search/search_model.h"
+#include "chrome/browser/ui/search/search_ui.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/contents_container.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "ui/base/hit_test.h"
@@ skipping 394 matching lines @@
       active_bookmark_bar_->GetToolbarOverlap(false);
   active_bookmark_bar_->SetVisible(true);
   active_bookmark_bar_->SetBounds(vertical_layout_rect_.x(), y,
                                   vertical_layout_rect_.width(),
                                   bookmark_bar_height);
   return y + bookmark_bar_height;
 }
 
 void BrowserViewLayout::LayoutBookmarkBarAtBottom() {
   DCHECK(active_bookmark_bar_);
+  // Layout bookmark bar at bottom of content view in the y-direction.
+  // Bookmark bar is child of |BrowserView| while content view is child of
+  // ContentsContainer, so convert its bottom coordinate relative to
+  // |BrowserView|.
   gfx::Point content_bottom(
       0, browser_view_->contents_container_->bounds().bottom());
   views::View::ConvertPointToTarget(
       browser_view_->contents_container_->parent(), browser_view_,
       &content_bottom);
-  if (!browser_view_->IsBookmarkBarVisible()) {
+  // Only show bookmark bar if height of content view is >=
+  // chrome::search::kMinContentHeightForBottomBookmarkBar.
+  if (browser_view_->contents_container_->height() <
+      chrome::search::kMinContentHeightForBottomBookmarkBar ||
+      !browser_view_->IsBookmarkBarVisible()) {
     active_bookmark_bar_->SetVisible(false);
     active_bookmark_bar_->SetBounds(0, content_bottom.y(),
                                     browser_view_->width(), 0);
+    return;
   }
 
   // BookmarkBarView uses infobar visibility to determine toolbar overlap, which
   // is 0 if bookmark bar is detached and infobar is visible.  Since the
   // bookmark bar on the NTP is detached at bottom of content view, toolbar
   // overlap is irrelevant.  So set infobar visible to force no toolbar overlap.
   active_bookmark_bar_->set_infobar_visible(true);
+  active_bookmark_bar_->SetVisible(true);
   int bookmark_bar_height = active_bookmark_bar_->GetPreferredSize().height();
-  active_bookmark_bar_->SetVisible(true);
   active_bookmark_bar_->SetBounds(vertical_layout_rect_.x(),
                                   content_bottom.y() - bookmark_bar_height,
                                   vertical_layout_rect_.width(),
                                   bookmark_bar_height);
 }
 
 int BrowserViewLayout::LayoutInfoBar(int top) {
   // Raise the |infobar_container_| by its vertical overlap.
   infobar_container_->SetVisible(InfobarVisible());
   int height;
@@ skipping 80 matching lines @@
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // 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);
 }