1 files changed, 25 insertions, 6 deletions

diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index c6dc2ce..651e9c7 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -36,7 +36,6 @@ class BookmarkBarView;
 class Browser;
 class BrowserBubble;
 class BrowserExtender;
-class BrowserLayoutManager;
 class DownloadShelfView;
 class EncodingMenuModel;
 class ExtensionShelf;
@@ -356,9 +355,6 @@ class BrowserView : public BrowserWindow,
     return browser_extender_.get();
   }
 
-  // Layout the Status Bubble.
-  void LayoutStatusBubble(int top);
-
  protected:
   // Overridden from views::View:
   virtual void Layout();
@@ -375,8 +371,28 @@ class BrowserView : public BrowserWindow,
   // Creates the system menu.
   void InitSystemMenu();
 #endif
-  // Returns the BrowserLayoutManager.
-  BrowserLayoutManager* GetBrowserLayoutManager() const;
+
+  // Layout the TabStrip, returns the coordinate of the bottom of the TabStrip,
+  // for laying out subsequent controls.
+  int LayoutTabStrip();
+  // Layout the following controls, starting at |top|, returns the coordinate
+  // of the bottom of the control, for laying out the next control.
+  int LayoutToolbar(int top);
+  int LayoutBookmarkAndInfoBars(int top);
+  int LayoutTopBar(int top);
+  int LayoutInfoBar(int top);
+  // Layout the TabContents container, between the coordinates |top| and
+  // |bottom|.
+  void LayoutTabContents(int top, int bottom);
+  int LayoutExtensionAndDownloadShelves();
+  // Layout the Extension Shelf, returns the coordinate of the top of the
+  // control, for laying out the previous control.
+  int LayoutExtensionShelf(int bottom);
+  // Layout the Download Shelf, returns the coordinate of the top of the
+  // control, for laying out the previous control.
+  int LayoutDownloadShelf(int bottom);
+  // Layout the Status Bubble.
+  void LayoutStatusBubble(int top);
 
   // Prepare to show the Bookmark Bar for the specified TabContents. Returns
   // true if the Bookmark Bar can be shown (i.e. it's supported for this
@@ -461,6 +477,9 @@ class BrowserView : public BrowserWindow,
   // The InfoBarContainer that contains InfoBars for the current tab.
   InfoBarContainer* infobar_container_;
 
+  // The distance the FindBar is from the top of the window, in pixels.
+  int find_bar_y_;
+
   // The view that contains the selected TabContents.
   TabContentsContainer* contents_container_;