The initial prototype code for the compact navigation (cnav) prototype, currently only active in windows. This is well hidden behind a flag and a context menu option.

Loosely based off oshima's original prototype patch: http://codereview.chromium.org/165272 

BUG=None
TEST=Activate the cnav prototype in about:flags. Right click a tab and select "Hide Toolbar" to go into cnav mode. Ensure that the compact location bar provides the same basic functionality as the toolbar (except browser actions).
Review URL: http://codereview.chromium.org/6913026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84831 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 1 deletions

diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index a112030..79b1461d 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -485,7 +485,6 @@ class Browser : public TabHandlerDelegate,
   void ToggleFullscreenMode();
   void Exit();
 #if defined(OS_CHROMEOS)
-  void ToggleCompactNavigationBar();
   void Search();
   void ShowKeyboardOverlay();
 #endif
@@ -583,6 +582,7 @@ class Browser : public TabHandlerDelegate,
 
   // Overridden from TabStripModelDelegate:
   virtual bool UseVerticalTabs() const;
+  virtual bool UseCompactNavigationBar() const;
 
   /////////////////////////////////////////////////////////////////////////////
 
@@ -704,6 +704,7 @@ class Browser : public TabHandlerDelegate,
   virtual void BookmarkAllTabs();
   virtual bool CanCloseTab() const;
   virtual void ToggleUseVerticalTabs();
+  virtual void ToggleUseCompactNavigationBar();
   virtual bool CanRestoreTab();
   virtual void RestoreTab();
   virtual bool LargeIconsPermitted() const;
@@ -1029,6 +1030,10 @@ class Browser : public TabHandlerDelegate,
   // policy of the tab strip model and notifies the window.
   void UseVerticalTabsChanged();
 
+  // Invoked when the use of the compact navigation bar preference changes.
+  // Notifies the window.
+  void UseCompactNavigationBarChanged();
+
   // Implementation of SupportsWindowFeature and CanSupportWindowFeature. If
   // |check_fullscreen| is true, the set of features reflect the actual state of
   // the browser, otherwise the set of features reflect the possible state of
@@ -1192,6 +1197,9 @@ class Browser : public TabHandlerDelegate,
   // Tracks the display mode of the tabstrip.
   mutable BooleanPrefMember use_vertical_tabs_;
 
+  // Tracks the display mode of the navigation bar.
+  mutable BooleanPrefMember use_compact_navigation_bar_;
+
   // The profile's tab restore service. The service is owned by the profile,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;