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

chrome/browser/views/frame/browser_view.cc

Index: chrome/browser/views/frame/browser_view.cc
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 8fb342a92ee61846c413acebb0c985f6f7cdd027..cb2820081fb601efbb74840a2d746bc1273817d4 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -568,12 +568,8 @@ gfx::Rect BrowserView::GetTabStripBounds() const {
 }
 
 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);
 }
@@ -1199,6 +1195,13 @@ int BrowserView::GetCommandId(const NativeWebKeyboardEvent& event) {
   return iter->second;
 }
 
+#if defined(TOOLKIT_VIEWS)
+void BrowserView::ToggleCompactNavigationBar() {
+  browser_extender_->ToggleCompactNavigationBar();
+  Layout();
+}
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindowTesting implementation: