Nukes the nano tab style on gtk and brings back the toolbar for apps

chrome/browser/gtk/browser_toolbar_gtk.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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 77 matching lines @@
       location_bar_(new LocationBarViewGtk(browser)),
       model_(browser->toolbar_model()),
       page_menu_model_(this, browser),
       app_menu_model_(this, browser),
       wrench_menu_model_(this, browser),
       browser_(browser),
       window_(window),
       profile_(NULL),
       menu_bar_helper_(this),
       upgrade_reminder_animation_(this),
-      upgrade_reminder_canceled_(false),
-      collapsed_(false) {
+      upgrade_reminder_canceled_(false) {
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
   browser_->command_updater()->AddCommandObserver(IDC_BOOKMARK_PAGE, this);
 
   registrar_.Add(this,
                  NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::UPGRADE_RECOMMENDED,
@@ skipping 176 matching lines @@
 }
 
 void BrowserToolbarGtk::Hide() {
   gtk_widget_hide(toolbar_);
 }
 
 LocationBar* BrowserToolbarGtk::GetLocationBar() const {
   return location_bar_.get();
 }
 
-void BrowserToolbarGtk::set_collapsed(bool val) {
-  collapsed_ = val;
-  if (collapsed_)
-    Hide();
-  else
-    Show();
-}
-
 void BrowserToolbarGtk::UpdateForBookmarkBarVisibility(
     bool show_bottom_padding) {
   gtk_alignment_set_padding(GTK_ALIGNMENT(alignment_),
       ShouldOnlyShowLocation() ? 0 : kTopPadding,
       !show_bottom_padding || ShouldOnlyShowLocation() ? 0 : kTopPadding,
       0, 0);
 }
 
 void BrowserToolbarGtk::ShowPageMenu() {
   if (page_menu_button_.get())
@@ skipping 527 matching lines @@
 
   return FALSE;
 }
 
 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() {
   return upgrade_reminder_animation_.cycles_remaining() > 0 &&
       // This funky looking math makes the badge throb for 2 seconds once
       // every 8 seconds.
       ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0;
 }