GTK: Don't show extension shelf when it's empty.

this gets rid of a 1 pixel grey line at the bottom of the web contents.

Also, do show the extension shelf in fullscreen (matching windows).

BUG=none (regression of crbug.com/17324)
TEST=one_in_shelf still works
Review URL: http://codereview.chromium.org/194094

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26131 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 18 deletions

diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index a091294..74f349b 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -1313,11 +1313,6 @@ void BrowserWindowGtk::MaybeShowBookmarkBar(TabContents* contents,
   }
 }
 
-void BrowserWindowGtk::MaybeShowExtensionShelf() {
-  if (extension_shelf_.get())
-    extension_shelf_->Show();
-}
-
 void BrowserWindowGtk::UpdateDevToolsForContents(TabContents* contents) {
   TabContents* old_devtools = devtools_container_->GetTabContents();
   if (old_devtools)
@@ -1380,8 +1375,6 @@ void BrowserWindowGtk::OnStateChanged(GdkWindowState state,
       tabstrip_->Hide();
       if (IsBookmarkBarSupported())
         bookmark_bar_->Hide(false);
-      if (extension_shelf_.get())
-        extension_shelf_->Hide();
     } else {
       UpdateCustomFrame();
       ShowSupportedWindowFeatures();
@@ -1638,7 +1631,6 @@ void BrowserWindowGtk::InitWidgets() {
     extension_shelf_.reset(new ExtensionShelfGtk(browser()->profile(),
                                                  browser_.get()));
     extension_shelf_->AddShelfToBox(content_vbox_);
-    MaybeShowExtensionShelf();
   }
 
   // This vbox surrounds the render area: find bar, info bars and render view.
@@ -2090,9 +2082,6 @@ void BrowserWindowGtk::ShowSupportedWindowFeatures() {
 
   if (IsBookmarkBarSupported())
     MaybeShowBookmarkBar(browser_->GetSelectedTabContents(), false);
-
-  if (IsExtensionShelfSupported())
-    MaybeShowExtensionShelf();
 }
 
 void BrowserWindowGtk::HideUnsupportedWindowFeatures() {
@@ -2102,10 +2091,8 @@ void BrowserWindowGtk::HideUnsupportedWindowFeatures() {
   if (!IsToolbarSupported())
     toolbar_->Hide();
 
-  if (!IsExtensionShelfSupported() && extension_shelf_.get())
-    extension_shelf_->Hide();
-
-  // If the bookmark bar is unsupported, then we never create it.
+  // If the bookmark bar or extension shelf is unsupported, then we never
+  // create them.
 }
 
 bool BrowserWindowGtk::IsTabStripSupported() const {
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index 4fb84e1..a43e6eb 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -212,9 +212,6 @@ class BrowserWindowGtk : public BrowserWindow,
   // Show or hide the bookmark bar.
   void MaybeShowBookmarkBar(TabContents* contents, bool animate);
 
-  // Show or hide the extension shelf.
-  void MaybeShowExtensionShelf();
-
   // Sets the default size for the window and the the way the user is allowed to
   // resize it.
   void SetGeometryHints();