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

chrome/browser/browser.cc

 // Copyright (c) 2006-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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/keyboard_codes.h"
@@ skipping 875 matching lines @@
 void Browser::ToggleFullscreenMode() {
   UserMetrics::RecordAction(L"ToggleFullscreen", profile_);
   window_->SetFullscreen(!window_->IsFullscreen());
   // On Linux, setting fullscreen mode is an async call to the X server, which
   // may or may not support fullscreen mode.
 #if !defined(OS_LINUX)
   UpdateCommandsForFullscreenMode(window_->IsFullscreen());
 #endif
 }
 
+#if defined(TOOLKIT_VIEWS)
+void Browser::ToggleCompactNavigationBar() {
+  UserMetrics::RecordAction(L"ToggleCompactNavigationBar", profile_);
+  window_->ToggleCompactNavigationBar();
+}
+#endif
+
 void Browser::Exit() {
   UserMetrics::RecordAction(L"Exit", profile_);
   BrowserList::CloseAllBrowsersAndExit();
 }
 
 void Browser::BookmarkCurrentPage() {
   UserMetrics::RecordAction(L"Star", profile_);
 
   BookmarkModel* model = profile()->GetBookmarkModel();
   if (!model || !model->IsLoaded())
@@ skipping 447 matching lines @@
     case IDC_SELECT_TAB_6:
     case IDC_SELECT_TAB_7:          SelectNumberedTab(id - IDC_SELECT_TAB_0);
                                                                    break;
     case IDC_SELECT_LAST_TAB:       SelectLastTab();               break;
     case IDC_DUPLICATE_TAB:         DuplicateTab();                break;
     case IDC_RESTORE_TAB:           RestoreTab();                  break;
     case IDC_COPY_URL:              WriteCurrentURLToClipboard();  break;
     case IDC_SHOW_AS_TAB:           ConvertPopupToTabbedBrowser(); break;
     case IDC_FULLSCREEN:            ToggleFullscreenMode();        break;
     case IDC_EXIT:                  Exit();                        break;
+#if defined(TOOLKIT_VIEWS)
+    case IDC_COMPACT_NAVBAR:        ToggleCompactNavigationBar();  break;
+#endif
 
     // Page-related commands
     case IDC_SAVE_PAGE:             SavePage();                    break;
     case IDC_BOOKMARK_PAGE:         BookmarkCurrentPage();         break;
     case IDC_BOOKMARK_ALL_TABS:     BookmarkAllTabs();             break;
     case IDC_VIEW_SOURCE:           ViewSource();                  break;
 #if defined(OS_WIN)
     case IDC_CLOSE_POPUPS:          ClosePopups();                 break;
 #endif
     case IDC_PRINT:                 Print();                       break;
@@ skipping 888 matching lines @@
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW_PROFILE_5, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW_PROFILE_6, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW_PROFILE_7, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_WINDOW_PROFILE_8, true);
   command_updater_.UpdateCommandEnabled(IDC_CLOSE_WINDOW, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_TAB, true);
   command_updater_.UpdateCommandEnabled(IDC_CLOSE_TAB, true);
   command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, true);
   command_updater_.UpdateCommandEnabled(IDC_FULLSCREEN, true);
   command_updater_.UpdateCommandEnabled(IDC_EXIT, true);
+#if defined(TOOLKIT_VIEWS)
+  command_updater_.UpdateCommandEnabled(IDC_COMPACT_NAVBAR, true);
+#endif
 
   // Page-related commands
   command_updater_.UpdateCommandEnabled(IDC_CLOSE_POPUPS, true);
   command_updater_.UpdateCommandEnabled(IDC_PRINT, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_AUTO_DETECT, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF8, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_UTF16LE, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_ISO88591, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_WINDOWS1252, true);
   command_updater_.UpdateCommandEnabled(IDC_ENCODING_GBK, true);
@@ skipping 665 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }