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

chrome/browser/chromeos/status_area_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/chromeos/status_area_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
@@ skipping 34 matching lines @@
   // These extra command IDs must be unique when combined with the options,
   // so we just pick up the numbering where that stops.
   enum OtherCommands {
     CREATE_NEW_WINDOW = StatusAreaView::OPEN_TABS_ON_RIGHT + 1,
   };
 
   explicit OptionsMenuModel(Browser* browser,
                             views::SimpleMenuModel::Delegate* delegate)
       : SimpleMenuModel(this),
         browser_(browser) {
+#if defined(TOOLKIT_VIEWS)
+    AddItemWithStringId(IDC_COMPACT_NAVBAR, IDS_COMPACT_NAVBAR);
+#else
     AddItem(static_cast<int>(CREATE_NEW_WINDOW),
             ASCIIToUTF16("New window"));
-
+#endif
     AddSeparator();
 
     AddItem(static_cast<int>(StatusAreaView::OPEN_TABS_ON_LEFT),
             ASCIIToUTF16("Open tabs on left"));
     AddItem(static_cast<int>(StatusAreaView::OPEN_TABS_CLOBBER),
             ASCIIToUTF16("Open tabs clobber"));
     AddItem(static_cast<int>(StatusAreaView::OPEN_TABS_ON_RIGHT),
             ASCIIToUTF16("Open tabs on right"));
   }
   virtual ~OptionsMenuModel() {
   }
 
   // SimpleMenuModel::Delegate implementation.
   virtual bool IsCommandIdChecked(int command_id) const {
     return StatusAreaView::GetOpenTabsMode() == command_id;
   }
   virtual bool IsCommandIdEnabled(int command_id) const {
     return true;
   }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       views::Accelerator* accelerator) {
     return false;
   }
   virtual void ExecuteCommand(int command_id) {
     switch (command_id) {
+#if defined(TOOLKIT_VIEWS)
+      case IDC_COMPACT_NAVBAR:
+        browser_->ExecuteCommand(command_id);
+        break;
+#else
       case CREATE_NEW_WINDOW:
-#if defined(TOOLKIT_VIEWS)
-        // TODO(oshima): Implement accelerator to enable/disable
-        // compact nav bar.
-#else
         // Reach into the GTK browser window and enable the flag to create the
         // next window as a compact nav one.
         // TODO(brettw) this is an evil hack, and is here so this can be tested.
         // Remove it eventually.
         static_cast<BrowserWindowGtk*>(browser_->window())->
             set_next_window_should_use_compact_nav();
         browser_->ExecuteCommand(IDC_NEW_WINDOW);
+        break;
 #endif
-        break;
       case StatusAreaView::OPEN_TABS_ON_LEFT:
       case StatusAreaView::OPEN_TABS_CLOBBER:
       case StatusAreaView::OPEN_TABS_ON_RIGHT:
         StatusAreaView::SetOpenTabsMode(
             static_cast<StatusAreaView::OpenTabsMode>(command_id));
         break;
       default:
         NOTREACHED();
     }
   }
@@ skipping 169 matching lines @@
 }
 
 void StatusAreaView::ExecuteCommand(int command_id) {
   browser_->ExecuteCommand(command_id);
 }
 
 void StatusAreaView::RunMenu(views::View* source, const gfx::Point& pt) {
   CreateAppMenu();
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }