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

chrome/browser/gtk/browser_window_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_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <string>
 
@@ skipping 845 matching lines @@
 
 void BrowserWindowGtk::FocusChromeOSStatus() {
   NOTIMPLEMENTED();
 }
 
 void BrowserWindowGtk::RotatePaneFocus(bool forwards) {
   NOTIMPLEMENTED();
 }
 
 bool BrowserWindowGtk::IsBookmarkBarVisible() const {
-  return IsBookmarkBarSupported() && bookmark_bar_.get() &&
+  return browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR) &&
+      bookmark_bar_.get() &&
       browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
 }
 
 bool BrowserWindowGtk::IsBookmarkBarAnimating() const {
   if (IsBookmarkBarSupported() && bookmark_bar_->IsAnimating())
     return true;
   return false;
 }
 
 bool BrowserWindowGtk::IsToolbarVisible() const {
@@ skipping 229 matching lines @@
 }
 
 void BrowserWindowGtk::Copy() {
   DoCutCopyPaste(this, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void BrowserWindowGtk::Paste() {
   DoCutCopyPaste(this, &RenderViewHost::Paste, "paste-clipboard");
 }
 
-void BrowserWindowGtk::SetToolbarCollapsedMode(bool val) {
-  toolbar_->set_collapsed(val);
-}
-
 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() {
   new DownloadInProgressDialogGtk(browser());
 }
 
 void BrowserWindowGtk::Observe(NotificationType type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED:
       MaybeShowBookmarkBar(browser_->GetSelectedTabContents(), true);
@@ skipping 81 matching lines @@
     gdk_window_invalidate_rect(GTK_WIDGET(window_)->window,
                                &GTK_WIDGET(window_)->allocation, TRUE);
     // For some reason, the above two calls cause the window shape to be
     // lost so reset it.
     UpdateWindowShape(bounds_.width(), bounds_.height());
   }
 }
 
 void BrowserWindowGtk::MaybeShowBookmarkBar(TabContents* contents,
                                             bool animate) {
-  if (!IsBookmarkBarSupported()) {
-    // Because the bookmark bar is never shown in app tab windows, we must
-    // explicitly hide to handle the case of switching tabs.
-    if (bookmark_bar_.get())
-      bookmark_bar_->Hide(false);  // animate
+  if (!IsBookmarkBarSupported())
     return;
-  }
 
   bool show_bar = false;
 
-  if (contents) {
+  if (IsBookmarkBarSupported() && contents) {
     bookmark_bar_->SetProfile(contents->profile());
     bookmark_bar_->SetPageNavigator(contents);
     show_bar = true;
   }
 
   if (show_bar && contents && !contents->ShouldShowBookmarkBar()) {
     PrefService* prefs = contents->profile()->GetPrefs();
     show_bar = prefs->GetBoolean(prefs::kShowBookmarkBar) && !IsFullscreen();
   }
 
@@ skipping 791 matching lines @@
     toolbar_->Hide();
 
   // If the bookmark bar shelf is unsupported, then we never create it.
 }
 
 bool BrowserWindowGtk::IsTabStripSupported() const {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP);
 }
 
 bool BrowserWindowGtk::IsToolbarSupported() const {
-  return !toolbar_->collapsed() &&
-         (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
-             browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR));
+  return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
+         browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
 }
 
 bool BrowserWindowGtk::IsBookmarkBarSupported() const {
-  // We never show the bookmark bar on app tab pages.
-  if (bookmark_bar_.get() && bookmark_bar_->OnAppsPage())
-    return false;
-
   return browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR);
 }
 
 bool BrowserWindowGtk::UsingCustomPopupFrame() const {
   GtkThemeProvider* theme_provider = GtkThemeProvider::GetFrom(
       browser()->profile());
   return !theme_provider->UseGtkTheme() &&
       browser()->type() & Browser::TYPE_POPUP;
 }
 
@@ skipping 95 matching lines @@
   // special-case the ones where the custom frame should be used.  These names
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }