Remove compact navbar: 1st step.

chrome/browser/chromeos/status/browser_status_area_view.cc

 // Copyright (c) 2010 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/browser_status_area_view.h"
 
 #include "app/l10n_util.h"
 #include "app/theme_provider.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 25 matching lines @@
   // so we just pick up the numbering where that stops.
   enum OtherCommands {
     CREATE_NEW_WINDOW = StatusAreaView::OPEN_TABS_ON_RIGHT + 1,
   };
 
   explicit OptionsMenuModel(BrowserView* browser_view)
       : SimpleMenuModel(this),
         browser_view_(browser_view) {
     AddCheckItemWithStringId(IDC_TOGGLE_VERTICAL_TABS,
                              IDS_TAB_CXMENU_USE_VERTICAL_TABS);
-    AddCheckItemWithStringId(IDC_COMPACT_NAVBAR, IDS_COMPACT_NAVBAR);
     AddSeparator();
 
     AddCheckItem(static_cast<int>(StatusAreaView::OPEN_TABS_ON_LEFT),
                  ASCIIToUTF16("Open tabs on left"));
     AddCheckItem(static_cast<int>(StatusAreaView::OPEN_TABS_CLOBBER),
                  ASCIIToUTF16("Open tabs clobber"));
     AddCheckItem(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 {
     if (command_id == IDC_TOGGLE_VERTICAL_TABS)
       return browser_view_->UseVerticalTabs();
-    if (command_id == IDC_COMPACT_NAVBAR)
-      return browser_view_->is_compact_style();
     return StatusAreaView::GetOpenTabsMode() == command_id;
   }
   virtual bool IsCommandIdEnabled(int command_id) const {
     return true;
   }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       menus::Accelerator* accelerator) {
-    return command_id == IDC_COMPACT_NAVBAR ?
-        browser_view_->GetAccelerator(command_id, accelerator) : false;
+    return false;
   }
   virtual void ExecuteCommand(int command_id) {
     switch (command_id) {
       case IDC_TOGGLE_VERTICAL_TABS:
-      case IDC_COMPACT_NAVBAR:
         browser_view_->browser()->ExecuteCommand(command_id);
         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 77 matching lines @@
 
 void BrowserStatusAreaView::ExecuteCommand(int command_id) {
   browser_view_->browser()->ExecuteCommand(command_id);
 }
 
 void BrowserStatusAreaView::RunMenu(views::View* source, const gfx::Point& pt) {
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 }  // namespace chromeos