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

chrome/browser/gtk/browser_toolbar_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
 #define CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
 
 #include <gtk/gtk.h>
 #include <string>
 
@@ skipping 65 matching lines @@
   ReloadButtonGtk* GetReloadButton() { return reload_.get(); }
 
   GtkWidget* GetAppMenuButton() { return app_menu_button_.get(); }
 
   BrowserActionsToolbarGtk* GetBrowserActionsToolbar() {
     return actions_toolbar_.get();
   }
 
   LocationBarViewGtk* GetLocationBarView() { return location_bar_.get(); }
 
-  bool collapsed() const { return collapsed_; }
-  void set_collapsed(bool val);
-
   // We have to show padding on the bottom of the toolbar when the bookmark
   // is in floating mode. Otherwise the bookmark bar will paint it for us.
   void UpdateForBookmarkBarVisibility(bool show_bottom_padding);
 
   void ShowPageMenu();
   void ShowAppMenu();
 
   // Overridden from CommandUpdater::CommandObserver:
   virtual void EnabledStateChangedForCommand(int id, bool enabled);
 
@@ skipping 175 matching lines @@
   MenuBarHelper menu_bar_helper_;
 
   // Manages the home button drop signal handler.
   scoped_ptr<GtkSignalRegistrar> drop_handler_;
 
   ThrobAnimation upgrade_reminder_animation_;
 
   // We have already shown and dismissed the upgrade reminder animation.
   bool upgrade_reminder_canceled_;
 
-  // When collapsed, the toolbar is just a tiny strip, no controls are visible.
-  bool collapsed_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_