Compact Navigation prototype

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

 // Copyright (c) 2011 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_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "ui/gfx/rect.h"
@@ skipping 44 matching lines @@
   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();
   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 tab strip region, returns the coordinate of the bottom of the
+  // TabStrip, for laying out subsequent controls. This also lays out the
+  // compact navigation and options bars if the browser is in compact navigation
+  // mode.
+  virtual int LayoutTabStripRegion();
 
   // 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);
   virtual int LayoutBookmarkAndInfoBars(int top);
   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
@@ skipping 27 matching lines @@
   const gfx::Rect& vertical_layout_rect() const {
     return vertical_layout_rect_;
   }
 
   // Child views that the layout manager manages.
   AbstractTabStripView* tabstrip_;
   ToolbarView* toolbar_;
   views::SingleSplitView* contents_split_;
   ContentsContainer* contents_container_;
   views::View* infobar_container_;
+  views::View* compact_navigation_bar_;
+  views::View* compact_options_bar_;
+  views::View* spacer_;

[sky, 2011/05/09 14:27:22]

compact_spacer_

[SteveT, 2011/05/09 19:40:04]

Done here and everywhere (and in browser_view.*).

   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_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_