Re-land 71230....

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

Index: chrome/browser/ui/views/frame/browser_view_layout.h
===================================================================
--- chrome/browser/ui/views/frame/browser_view_layout.h	(revision 71256)
+++ chrome/browser/ui/views/frame/browser_view_layout.h	(working copy)
@@ -14,8 +14,13 @@
 class BrowserView;
 class ContentsContainer;
 class DownloadShelfView;
+class TabContentsContainer;
 class ToolbarView;
 
+namespace views {
+class SingleSplitView;
+}
+
 // The layout manager used in chrome browser.
 class BrowserViewLayout : public views::LayoutManager {
  public:
@@ -61,6 +66,15 @@
   int LayoutBookmarkBar(int top);
   int LayoutInfoBar(int top);
 
+  // Updates |source|'s reserved contents rect by mapping BrowserView's
+  // |browser_reserved_rect| into |future_source_bounds| taking into
+  // account |source|'s |future_parent_offset| (offset is relative to
+  // browser_view_).
+  void UpdateReservedContentsRect(const gfx::Rect& browser_reserved_rect,
+                                  TabContentsContainer* source,
+                                  const gfx::Rect& future_source_bounds,
+                                  const gfx::Point& future_parent_offset);
+
   // Layout the TabContents container, between the coordinates |top| and
   // |bottom|.
   void LayoutTabContents(int top, int bottom);
@@ -88,7 +102,7 @@
   // Child views that the layout manager manages.
   BaseTabStrip* tabstrip_;
   ToolbarView* toolbar_;
-  views::View* contents_split_;
+  views::SingleSplitView* contents_split_;
   ContentsContainer* contents_container_;
   views::View* infobar_container_;
   DownloadShelfView* download_shelf_;