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

chrome/browser/gtk/browser_toolbar_gtk.h

Index: chrome/browser/gtk/browser_toolbar_gtk.h
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h
index 20860de968389356258a87e6dbacd1421019ee61..b1a6da316b6fd0ea5f73a8a71eeb1d856c5d2202 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.h
+++ b/chrome/browser/gtk/browser_toolbar_gtk.h
@@ -83,9 +83,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
 
   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);
@@ -281,9 +278,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
   // 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);
 };