Bunch of match preview tweaks:

chrome/browser/views/frame/browser_view_layout.h

Index: chrome/browser/views/frame/browser_view_layout.h
diff --git a/chrome/browser/views/frame/browser_view_layout.h b/chrome/browser/views/frame/browser_view_layout.h
index 3175bdf6baa46b95e46fbaf3898fc6592d4dc709..42652efa99522f822545796008bb6083ccee6615 100644
--- a/chrome/browser/views/frame/browser_view_layout.h
+++ b/chrome/browser/views/frame/browser_view_layout.h
@@ -6,9 +6,16 @@
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
 #pragma once
 
-#include "chrome/browser/views/frame/browser_view.h"
 #include "views/layout_manager.h"
 
+class BaseTabStrip;
+class BookmarkBarView;
+class Browser;
+class BrowserView;
+class ContentsContainer;
+class DownloadShelfView;
+class ToolbarView;
+
 // The layout manager used in chrome browser.
 class BrowserViewLayout : public views::LayoutManager {
  public:
@@ -40,12 +47,8 @@ class BrowserViewLayout : public views::LayoutManager {
   virtual gfx::Size GetPreferredSize(views::View* host);
 
  protected:
-  Browser* browser() {
-    return browser_view_->browser();
-  }
-  const Browser* browser() const {
-    return browser_view_->browser();
-  }
+  Browser* browser();
+  const Browser* browser() const;
 
   // Layout the TabStrip, returns the coordinate of the bottom of the TabStrip,
   // for laying out subsequent controls.
@@ -62,6 +65,11 @@ class BrowserViewLayout : public views::LayoutManager {
   // |bottom|.
   void LayoutTabContents(int top, int bottom);
 
+  // Returns the top margin to adjust the contents_container_ by. This is used
+  // to make the bookmark bar and contents_container_ overlap so that the
+  // preview contents hides the bookmark bar.
+  int GetTopMarginForActiveContent();
+
   // Layout the Download Shelf, returns the coordinate of the top of the
   // control, for laying out the previous control.
   int LayoutDownloadShelf(int bottom);
@@ -81,7 +89,7 @@ class BrowserViewLayout : public views::LayoutManager {
   BaseTabStrip* tabstrip_;
   ToolbarView* toolbar_;
   views::View* contents_split_;
-  views::View* contents_container_;
+  ContentsContainer* contents_container_;
   views::View* infobar_container_;
   DownloadShelfView* download_shelf_;
   BookmarkBarView* active_bookmark_bar_;