Make tabstrip flush with top of titlebar when custom frame is enabled and bro...

chrome/browser/gtk/browser_titlebar.cc

 // Copyright (c) 2009 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 <gtk/gtk.h>
 
 #include "app/resource_bundle.h"
 #include "app/l10n_util.h"
@@ skipping 43 matching lines @@
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     otr_avatar = rb.GetRTLEnabledPixbufNamed(IDR_OTR_ICON);
   }
   return otr_avatar;
 }
 
 }  // namespace
 
 BrowserTitlebar::BrowserTitlebar(BrowserWindowGtk* browser_window,
                                  GtkWindow* window)
-    : browser_window_(browser_window), window_(window) {
+    : browser_window_(browser_window), window_(window),
+      using_custom_frame_(false) {
   Init();
 }
 
 void BrowserTitlebar::Init() {
   // The widget hierarchy is shown below.
   //
   // +- HBox (container_) -----------------------------------------------------+
   // |+- Algn. -++- Alignment --------------++- VBox (titlebar_buttons_box_) -+|
   // ||+ Image +||   (titlebar_alignment_)  ||+- HBox -----------------------+||
   // |||spy_guy|||                          |||+- button -++- button -+      |||
@@ skipping 64 matching lines @@
   g_signal_connect(button->widget(), "motion-notify-event",
                    G_CALLBACK(OnMouseMoveEvent), browser_window_);
   std::string localized_tooltip = l10n_util::GetStringUTF8(tooltip);
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
   gtk_box_pack_end(GTK_BOX(box), button->widget(), FALSE, FALSE, 0);
   return button;
 }
 
 void BrowserTitlebar::UpdateCustomFrame(bool use_custom_frame) {
-  if (use_custom_frame) {
+  using_custom_frame_ = use_custom_frame;
+  if (use_custom_frame)
+    gtk_widget_show(titlebar_buttons_box_);
+  else
+    gtk_widget_hide(titlebar_buttons_box_);
+  UpdateTitlebarAlignment();
+}
+
+void BrowserTitlebar::UpdateTitlebarAlignment() {
+  if (using_custom_frame_ && !browser_window_->IsMaximized()) {
     gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_),
         kTitlebarHeight, 0, 0, 0);
-    gtk_widget_show(titlebar_buttons_box_);
   } else {
     gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_), 0, 0, 0, 0);
-    gtk_widget_hide(titlebar_buttons_box_);
   }
 }
 
+// static
 gboolean BrowserTitlebar::OnWindowStateChanged(GtkWindow* window,
     GdkEventWindowState* event, BrowserTitlebar* titlebar) {
   // Update the maximize/restore button.
   if (titlebar->browser_window_->IsMaximized()) {
     gtk_widget_hide(titlebar->maximize_button_->widget());
     gtk_widget_show(titlebar->restore_button_->widget());
   } else {
     gtk_widget_hide(titlebar->restore_button_->widget());
     gtk_widget_show(titlebar->maximize_button_->widget());
   }
+  titlebar->UpdateTitlebarAlignment();
   return FALSE;
 }
 
+// static
 void BrowserTitlebar::OnButtonClicked(GtkWidget* button,
                                       BrowserTitlebar* titlebar) {
   if (titlebar->close_button_->widget() == button) {
     titlebar->browser_window_->Close();
   } else if (titlebar->restore_button_->widget() == button) {
     gtk_window_unmaximize(titlebar->window_);
   } else if (titlebar->maximize_button_->widget() == button) {
     gtk_window_maximize(titlebar->window_);
   } else if (titlebar->minimize_button_->widget() == button) {
     gtk_window_iconify(titlebar->window_);
@@ skipping 64 matching lines @@
       PrefService* prefs = browser_window_->browser()->profile()->GetPrefs();
       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
                         !prefs->GetBoolean(prefs::kUseCustomChromeFrame));
       break;
     }
 
     default:
       NOTREACHED();
   }
 }