GTK: Don't show toolbar border without the toolbar.

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 1258 matching lines @@
           CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
       if (!is_kiosk) {
         fullscreen_exit_bubble_.reset(new FullscreenExitBubbleGtk(
             GTK_FLOATING_CONTAINER(render_area_floating_container_)));
       }
       gtk_widget_hide(toolbar_border_);
     } else {
       fullscreen_exit_bubble_.reset();
       UpdateCustomFrame();
       ShowSupportedWindowFeatures();
-
-      gtk_widget_show(toolbar_border_);
-      gdk_window_lower(toolbar_border_->window);
     }
   }
 
   UpdateWindowShape(bounds_.width(), bounds_.height());
   SaveWindowPosition();
 }
 
 void BrowserWindowGtk::UnMaximize() {
   // It can happen that you end up with a window whose restore size is the same
   // as the size of the screen, so unmaximizing it merely remaximizes it due to
@@ skipping 185 matching lines @@
   render_area_vbox_ = gtk_vbox_new(FALSE, 0);
   gtk_widget_set_name(render_area_vbox_, "chrome-render-area-vbox");
   render_area_floating_container_ = gtk_floating_container_new();
   gtk_container_add(GTK_CONTAINER(render_area_floating_container_),
                     render_area_vbox_);
 
   toolbar_border_ = gtk_event_box_new();
   gtk_box_pack_start(GTK_BOX(render_area_vbox_),
                      toolbar_border_, FALSE, FALSE, 0);
   gtk_widget_set_size_request(toolbar_border_, -1, 1);
-  gtk_widget_show(toolbar_border_);
+  gtk_widget_set_no_show_all(toolbar_border_, TRUE);
+
+  if (IsToolbarSupported())
+    gtk_widget_show(toolbar_border_);
 
   infobar_container_.reset(new InfoBarContainerGtk(browser_->profile()));
   gtk_box_pack_start(GTK_BOX(render_area_vbox_),
                      infobar_container_->widget(),
                      FALSE, FALSE, 0);
 
   status_bubble_.reset(new StatusBubbleGtk(browser_->profile()));
 
   contents_container_.reset(new TabContentsContainerGtk(status_bubble_.get()));
   devtools_container_.reset(new TabContentsContainerGtk(NULL));
@@ skipping 74 matching lines @@
   // When the cursor is over the divider, GTK+ normally lightens the background
   // color by 1.3 (see LIGHTNESS_MULT in gtkstyle.c).  Since we're setting the
   // color, override the prelight also.
   color_utils::HSL hsl = { -1, 0.5, 0.65 };
   SkColor frame_prelight_color = color_utils::HSLShift(frame_color, hsl);
   GdkColor frame_prelight_color_gdk = SkColorToGdkColor(frame_prelight_color);
   gtk_widget_modify_bg(contents_split_, GTK_STATE_PRELIGHT,
       &frame_prelight_color_gdk);
 
   GdkColor border_color = theme_provider->GetBorderColor();
+

[Evan Martin, 2010/04/06 01:35:39]

intentional?

[Evan Stade, 2010/04/06 01:39:40]

no

   gtk_widget_modify_bg(toolbar_border_, GTK_STATE_NORMAL, &border_color);
 }
 
 void BrowserWindowGtk::OnSizeChanged(int width, int height) {
   UpdateWindowShape(width, height);
 }
 
 void BrowserWindowGtk::UpdateWindowShape(int width, int height) {
   if (UseCustomFrame() && !IsFullscreen() && !IsMaximized()) {
     // Make the top corners rounded.  We set a mask that includes most of the
@@ skipping 331 matching lines @@
     browser_->ExecuteCommand(id);
     return true;
   }
   return false;
 }
 
 void BrowserWindowGtk::ShowSupportedWindowFeatures() {
   if (IsTabStripSupported())
     tabstrip_->Show();
 
-  if (IsToolbarSupported())
+  if (IsToolbarSupported()) {
     toolbar_->Show();
+    gtk_widget_show(toolbar_border_);
+    gdk_window_lower(toolbar_border_->window);
+  }
 
   if (IsBookmarkBarSupported())
     MaybeShowBookmarkBar(browser_->GetSelectedTabContents(), false);
 }
 
 void BrowserWindowGtk::HideUnsupportedWindowFeatures() {
   if (!IsTabStripSupported())
     tabstrip_->Hide();
 
   if (!IsToolbarSupported())
@@ skipping 114 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }