Remove the compact nav flag and ensure it is always disabled. Note that the rest of the cnav code...

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2011 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/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1973 matching lines @@
     jumplist_.reset(new JumpList);
     jumplist_->AddObserver(browser_->profile());
   }
 
   if (AeroPeekManager::Enabled()) {
     aeropeek_manager_.reset(new AeroPeekManager(
         frame_->GetNativeWindow()));
     browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get());
   }
 #endif
+  // TODO(stevet): Remove all of this once we clean up compact navigation. Note
+  // that we revert back to checking the pref as we've guaranteed that it will
+  // always return false, regardless of flags.
   // Only create our compact navigation classes if the switch is enabled. Note
   // that we directly check the switch and not the pref as the switch may be on
   // and the pref could be off (currently not selected in the context menu).
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableCompactNavigation)) {
+  // if (CommandLine::ForCurrentProcess()->HasSwitch(
+  //     switches::kEnableCompactNavigation)) {
+  if (UseCompactNavigationBar()) {
     compact_location_bar_view_host_.reset(new CompactLocationBarViewHost(this));
     compact_navigation_bar_ = new CompactNavigationBar(this);
     compact_navigation_bar_->set_id(VIEW_ID_COMPACT_NAV_BAR);
     AddChildView(compact_navigation_bar_);
     compact_navigation_bar_->Init();
     compact_options_bar_ = new CompactOptionsBar(this);
     compact_options_bar_->set_id(VIEW_ID_COMPACT_OPT_BAR);
     AddChildView(compact_options_bar_);
     compact_options_bar_->Init();
   }
@@ skipping 638 matching lines @@
   view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }