GTK: Another GTK deprecation patch.

chrome/browser/ui/gtk/tab_contents_container_gtk.cc

 // Copyright (c) 2011 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/ui/gtk/tab_contents_container_gtk.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "chrome/browser/ui/gtk/status_bubble_gtk.h"
@@ skipping 147 matching lines @@
     gtk_widget_hide(widget);
 
   tab->web_contents()->WasHidden();
 }
 
 void TabContentsContainerGtk::DetachTab(TabContentsWrapper* tab) {
   gfx::NativeView widget = tab->web_contents()->GetNativeView();
 
   // It is possible to detach an unrealized, unparented TabContents if you
   // slow things down enough in valgrind. Might happen in the real world, too.
-  if (widget && widget->parent) {
-    DCHECK_EQ(widget->parent, expanded_);
+  GtkWidget* parent = gtk_widget_get_parent(widget);

[Evan Martin, 2012/01/05 22:50:37]

Do we need to null-check widget first here?  We do just below...

[Elliot Glaysher, 2012/01/05 23:19:49]

Good catch

+  if (widget && parent) {
+    DCHECK_EQ(parent, expanded_);
     gtk_container_remove(GTK_CONTAINER(expanded_), widget);
   }
 }
 
 void TabContentsContainerGtk::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED);
 
@@ skipping 60 matching lines @@
     g_value_set_int(&value, allocation->width - requisition.width);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    status->widget(), "x", &value);
 
   int child_y = std::max(allocation->height - requisition.height, 0);
   g_value_set_int(&value, child_y + status->y_offset());
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    status->widget(), "y", &value);
   g_value_unset(&value);
 }