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

chrome/browser/gtk/browser_toolbar_gtk.cc

Index: chrome/browser/gtk/browser_toolbar_gtk.cc
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index b45d4c5cc25e605b384ed5b7e75ab6224c34346c..ebebf4db4a8868b9d6b26fd70fae87d1bb4c5e82 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -95,8 +95,7 @@ BrowserToolbarGtk::BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* 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);
@@ -293,14 +292,6 @@ 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_),