Fix a bug where we tried to get the position of the tabstrip

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 <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 93 matching lines @@
   // |||spy_guy|||                          |||+- button -++- button -+      |||
   // |||       |||+- TabStripGtk  ---------+|||| minimize || restore  | ...  |||
   // |||  )8\  |||| tab   tab   tabclose   ||||+----------++----------+      |||
   // ||+-------+||+------------------------+||+------------------------------+||
   // |+---------++--------------------------++--------------------------------+|
   // +-------------------------------------------------------------------------+
   //
   // If we're a popup window or in app mode, we don't display the spy guy or
   // the tab strip.  Instead, put an hbox in titlebar_alignment_ in place of
   // the tab strip.
-  // +- Alignment (titlebar_alignment_) ----------------------------+
-  // |+ HBox ------------------------------------------------------+|
-  // ||+- Image (app_mode_favicon_) -++- Label (app_mode_title_) -+||
-  // |||  favicon                    ||  page title               |||
-  // ||+-----------------------------++---------------------------+||
-  // |+------------------------------------------------------------+|
-  // +--------------------------------------------------------------+
+  // +- Alignment (titlebar_alignment_) -----------------------------------+
+  // |+ HBox -------------------------------------------------------------+|
+  // ||+- TabStripGtk -++- Image ----------------++- Label --------------+||
+  // ||| hidden        ++    (app_mode_favicon_) ||    (app_mode_title_) |||
+  // |||               ||  favicon               ||  page title          |||
+  // ||+---------------++------------------------++----------------------+||
+  // |+-------------------------------------------------------------------+|
+  // +---------------------------------------------------------------------+
   GtkWidget* container_hbox = gtk_hbox_new(FALSE, 0);
 
   container_ = gtk_event_box_new();
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(container_), FALSE);
   gtk_container_add(GTK_CONTAINER(container_), container_hbox);
 
   g_signal_connect(G_OBJECT(container_), "scroll-event",
                    G_CALLBACK(OnScroll), this);
 
   g_signal_connect(window_, "window-state-event",
@@ skipping 22 matching lines @@
     // Put the tab strip in the titlebar.
     gtk_container_add(GTK_CONTAINER(titlebar_alignment_),
                       browser_window_->tabstrip()->widget());
   } else {
     // App mode specific widgets.
     gtk_box_pack_start(GTK_BOX(container_hbox), titlebar_alignment_, TRUE,
                        TRUE, 0);
     GtkWidget* app_mode_hbox = gtk_hbox_new(FALSE, kIconTitleSpacing);
     gtk_container_add(GTK_CONTAINER(titlebar_alignment_), app_mode_hbox);
 
+    // Put the tab strip in the hbox even though we don't show it.  Sometimes
+    // we need the position of the tab strip so make sure it's in our widget
+    // hierarchy.
+    gtk_box_pack_start(GTK_BOX(app_mode_hbox),
+        browser_window_->tabstrip()->widget(), FALSE, FALSE, 0);
+
     // We use the app logo as a placeholder image so the title doesn't jump
     // around.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     // TODO(tc): Add a left click menu to this icon.
     app_mode_favicon_ = gtk_image_new_from_pixbuf(
         rb.GetRTLEnabledPixbufNamed(IDR_PRODUCT_LOGO_16));
     gtk_box_pack_start(GTK_BOX(app_mode_hbox), app_mode_favicon_, FALSE,
                        FALSE, 0);
 
     app_mode_title_ = gtk_label_new(NULL);
@@ skipping 263 matching lines @@
   size_t num_frames = frame_strip->width() / frame_size;
   g_throbber_frames = new std::vector<GdkPixbuf*>;
 
   // Make a separate GdkPixbuf for each frame of the animation.
   for (size_t i = 0; i < num_frames; ++i) {
     SkBitmap frame = skia::ImageOperations::CreateTiledBitmap(*frame_strip,
         i * frame_size, 0, frame_size, frame_size);
     g_throbber_frames->push_back(gfx::GdkPixbufFromSkBitmap(&frame));
   }
 }