Bunch of match preview tweaks:

chrome/browser/views/frame/browser_view_layout.cc

 // Copyright (c) 2010 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/views/frame/browser_view_layout.h"
 
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/frame/browser_view.h"
+#include "chrome/browser/views/frame/contents_container.h"
 #include "chrome/browser/views/tabs/side_tab_strip.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "gfx/scrollbar_size.h"
 #include "views/window/window.h"
 
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif
 
@@ skipping 174 matching lines @@
   active_bookmark_bar_ = NULL;
   tabstrip_ = NULL;
   browser_view_ = static_cast<BrowserView*>(host);
 }
 
 void BrowserViewLayout::Uninstalled(views::View* host) {}
 
 void BrowserViewLayout::ViewAdded(views::View* host, views::View* view) {
   switch (view->GetID()) {
     case VIEW_ID_CONTENTS_SPLIT: {
-        contents_split_ = view;
-        if (SidebarManager::IsSidebarAllowed()) {
-          views::View* sidebar_split = contents_split_->GetChildViewAt(0);
-          contents_container_ = sidebar_split->GetChildViewAt(0);
-        } else {
-          contents_container_ = contents_split_->GetChildViewAt(0);
-        }
+      contents_split_ = view;
+      // TODO: this is fragile, fix.
+      if (SidebarManager::IsSidebarAllowed()) {
+        views::View* sidebar_split = contents_split_->GetChildViewAt(0);
+        contents_container_ = static_cast<ContentsContainer*>(
+            sidebar_split->GetChildViewAt(0));
+      } else {
+        contents_container_ = static_cast<ContentsContainer*>(
+            contents_split_->GetChildViewAt(0));
       }
       break;
+    }
     case VIEW_ID_INFO_BAR_CONTAINER:
       infobar_container_ = view;
       break;
     case VIEW_ID_DOWNLOAD_SHELF:
       download_shelf_ = static_cast<DownloadShelfView*>(view);
       break;
     case VIEW_ID_BOOKMARK_BAR:
       active_bookmark_bar_ = static_cast<BookmarkBarView*>(view);
       break;
     case VIEW_ID_TOOLBAR:
@@ skipping 17 matching lines @@
   vertical_layout_rect_ = browser_view_->GetLocalBounds(true);
   int top = LayoutTabStrip();
   if (browser_view_->IsTabStripVisible() && !browser_view_->UseVerticalTabs()) {
     tabstrip_->SetBackgroundOffset(gfx::Point(
         tabstrip_->MirroredX() + browser_view_->MirroredX(),
         browser_view_->frame()->GetHorizontalTabStripVerticalOffset(false)));
   }
   top = LayoutToolbar(top);
   top = LayoutBookmarkAndInfoBars(top);
   int bottom = LayoutDownloadShelf(browser_view_->height());
+  int active_top_margin = GetTopMarginForActiveContent();
+  top -= active_top_margin;
+  bottom += active_top_margin;
+  contents_container_->SetActiveTopMargin(active_top_margin);
   LayoutTabContents(top, bottom);
   // This must be done _after_ we lay out the TabContents since this
   // code calls back into us to find the bounding box the find bar
   // must be laid out within, and that code depends on the
   // TabContentsContainer's bounds being up to date.
   if (browser()->HasFindBarController()) {
     browser()->GetFindBarController()->find_bar()->MoveWindowIfNecessary(
         gfx::Rect(), true);
   }
   // Align status bubble with the bottom of the contents_container.
   browser_view_->LayoutStatusBubble(
       top + contents_container_->bounds().height());
   browser_view_->SchedulePaint();
 }
 
 // Return the preferred size which is the size required to give each
 // children their respective preferred size.
 gfx::Size BrowserViewLayout::GetPreferredSize(views::View* host) {
   return gfx::Size();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BrowserViewLayout, private:
 
+Browser* BrowserViewLayout::browser() {
+  return browser_view_->browser();
+}
+
+const Browser* BrowserViewLayout::browser() const {
+  return browser_view_->browser();
+}
+
 int BrowserViewLayout::LayoutTabStrip() {
   if (!browser_view_->IsTabStripVisible()) {
     tabstrip_->SetVisible(false);
     tabstrip_->SetBounds(0, 0, 0, 0);
     return 0;
   }
 
   gfx::Rect tabstrip_bounds(
       browser_view_->frame()->GetBoundsForTabStrip(tabstrip_));
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
@@ skipping 61 matching lines @@
 
 int BrowserViewLayout::LayoutInfoBar(int top) {
   bool visible = InfobarVisible();
   int height = visible ? infobar_container_->GetPreferredSize().height() : 0;
   infobar_container_->SetVisible(visible);
   infobar_container_->SetBounds(vertical_layout_rect_.x(), top,
                                 vertical_layout_rect_.width(), height);
   return top + height;
 }
 
-// Layout the TabContents container, between the coordinates |top| and
-// |bottom|.
 void BrowserViewLayout::LayoutTabContents(int top, int bottom) {
   contents_split_->SetBounds(vertical_layout_rect_.x(), top,
                              vertical_layout_rect_.width(), bottom - top);
 }
 
+int BrowserViewLayout::GetTopMarginForActiveContent() {
+  if (!active_bookmark_bar_ || !browser_view_->IsBookmarkBarVisible() ||
+      !active_bookmark_bar_->IsDetached()) {
+    return 0;
+  }
+
+  if (contents_split_->GetChildViewAt(1) &&
+      contents_split_->GetChildViewAt(1)->IsVisible())
+    return 0;
+
+  if (SidebarManager::IsSidebarAllowed()) {
+    views::View* sidebar_split = contents_split_->GetChildViewAt(0);
+    if (sidebar_split->GetChildViewAt(1) &&
+        sidebar_split->GetChildViewAt(1)->IsVisible())
+      return 0;
+  }
+
+  return active_bookmark_bar_->height();
+}
+
 int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
   // Re-layout the shelf either if it is visible or if it's close animation
   // is currently running.
   if (browser_view_->IsDownloadShelfVisible() ||
       (download_shelf_ && download_shelf_->IsClosing())) {
     bool visible = browser()->SupportsWindowFeature(
         Browser::FEATURE_DOWNLOADSHELF);
     DCHECK(download_shelf_);
     int height = visible ? download_shelf_->GetPreferredSize().height() : 0;
     download_shelf_->SetVisible(visible);
     download_shelf_->SetBounds(vertical_layout_rect_.x(), bottom - height,
                                vertical_layout_rect_.width(), height);
     download_shelf_->Layout();
     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);
 }