[gtk] don't show custom frame min/max/close when theme is changed.

chrome/browser/gtk/browser_titlebar.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_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 450 matching lines @@
       gtk_widget_show(titlebar_left_spy_frame_);
       gtk_widget_hide(titlebar_right_spy_frame_);
     } else {
       gtk_container_add(GTK_CONTAINER(titlebar_right_spy_frame_), spy_guy);
       gtk_widget_show(titlebar_right_spy_frame_);
       gtk_widget_hide(titlebar_left_spy_frame_);
     }
   }
 
   // Now show the correct widgets in the two hierarchies.
-  gtk_widget_show_all(titlebar_left_buttons_vbox_);
-  gtk_widget_show_all(titlebar_right_buttons_vbox_);
+  if (using_custom_frame_) {
+    gtk_widget_show_all(titlebar_left_buttons_vbox_);
+    gtk_widget_show_all(titlebar_right_buttons_vbox_);
+  }
   UpdateMaximizeRestoreVisibility();
 }
 
 GtkWidget* BrowserTitlebar::GetButtonHBox(bool left_side) {
   if (left_side && titlebar_left_buttons_hbox_)
     return titlebar_left_buttons_hbox_;
   else if (!left_side && titlebar_right_buttons_hbox_)
     return titlebar_right_buttons_hbox_;
 
   // We put the min/max/restore/close buttons in a vbox so they are top aligned
@@ skipping 32 matching lines @@
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
   gtk_box_pack_start(GTK_BOX(box), button->widget(), FALSE, FALSE, 0);
   return button;
 }
 
 void BrowserTitlebar::UpdateCustomFrame(bool use_custom_frame) {
   using_custom_frame_ = use_custom_frame;
   if (use_custom_frame) {
     if (titlebar_left_buttons_vbox_)
-      gtk_widget_show(titlebar_left_buttons_vbox_);
+      gtk_widget_show_all(titlebar_left_buttons_vbox_);
     if (titlebar_right_buttons_vbox_)
-      gtk_widget_show(titlebar_right_buttons_vbox_);
+      gtk_widget_show_all(titlebar_right_buttons_vbox_);
   } else {
     if (titlebar_left_buttons_vbox_)
       gtk_widget_hide(titlebar_left_buttons_vbox_);
     if (titlebar_right_buttons_vbox_)
       gtk_widget_hide(titlebar_right_buttons_vbox_);
   }
   UpdateTitlebarAlignment();
 }
 
 void BrowserTitlebar::UpdateTitleAndIcon() {
@@ skipping 399 matching lines @@
     menus::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }