Bunch of match preview tweaks:

chrome/browser/views/frame/browser_view_layout.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
 #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:
   BrowserViewLayout();
   virtual ~BrowserViewLayout() {}
 
   // Returns the minimum size of the browser view.
   virtual gfx::Size GetMinimumSize();
 
   // Returns the bounding box for the find bar.
@@ skipping 11 matching lines @@
 
   // views::LayoutManager overrides:
   virtual void Installed(views::View* host);
   virtual void Uninstalled(views::View* host);
   virtual void ViewAdded(views::View* host, views::View* view);
   virtual void ViewRemoved(views::View* host, views::View* view);
   virtual void Layout(views::View* host);
   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.
   virtual int LayoutTabStrip();
 
   // Layout the following controls, starting at |top|, returns the coordinate
   // of the bottom of the control, for laying out the next control.
   virtual int LayoutToolbar(int top);
   int LayoutBookmarkAndInfoBars(int top);
   int LayoutBookmarkBar(int top);
   int LayoutInfoBar(int top);
 
   // Layout the TabContents container, between the coordinates |top| and
   // |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);
 
   // Returns true if an infobar is showing.
   bool InfobarVisible() const;
 
   // See description above vertical_layout_rect_ for details.
   void set_vertical_layout_rect(const gfx::Rect& bounds) {
     vertical_layout_rect_ = bounds;
   }
   const gfx::Rect& vertical_layout_rect() const {
     return vertical_layout_rect_;
   }
 
   // Child views that the layout manager manages.
   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_;
 
   BrowserView* browser_view_;
 
   // The bounds within which the vertically-stacked contents of the BrowserView
   // should be laid out within. When the SideTabstrip is not visible, this is
   // just the local bounds of the BrowserView, otherwise it's the local bounds
   // of the BrowserView less the width of the SideTabstrip.
   gfx::Rect vertical_layout_rect_;
 
   // The distance the FindBar is from the top of the window, in pixels.
   int find_bar_y_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_