CompactNavigationBar for toolkit views build, with some design change per Cole's request.

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 550 matching lines @@
   // So return what the tabstrip height _ought_ to be right now.
   return IsTabStripVisible() ? tabstrip_->GetView()->GetPreferredSize().height()
                              : 0;
 }
 
 gfx::Rect BrowserView::GetTabStripBounds() const {
   return frame_->GetBoundsForTabStrip(tabstrip_);
 }
 
 bool BrowserView::IsToolbarVisible() const {
-#if defined(OS_CHROMEOS)
-  if (browser_->type() & Browser::TYPE_POPUP) {
-    // Don't show toolbar if the window is a popup.
+  if (browser_extender_->ShouldForceHideToolbar())
     return false;
-  }
-#endif
   return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
          browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
 }
 
 bool BrowserView::IsTabStripVisible() const {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP);
 }
 
 bool BrowserView::IsOffTheRecord() const {
   return browser_->profile()->IsOffTheRecord();
@@ skipping 605 matching lines @@
           NativeWebKeyboardEvent::AltKey);
 
   std::map<views::Accelerator, int>::const_iterator iter =
       accelerator_table_.find(accelerator);
   if (iter == accelerator_table_.end())
     return -1;
 
   return iter->second;
 }
 
+#if defined(TOOLKIT_VIEWS)
+void BrowserView::ToggleCompactNavigationBar() {
+  browser_extender_->ToggleCompactNavigationBar();
+  Layout();
+}
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindowTesting implementation:
 
 BookmarkBarView* BrowserView::GetBookmarkBarView() const {
   return bookmark_bar_view_.get();
 }
 
 LocationBarView* BrowserView::GetLocationBarView() const {
   return toolbar_->location_bar();
 }
@@ skipping 1041 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }