Two tab dragging fixes for various window managers:...

chrome/common/gtk_util.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/common/gtk_util.h"
 
-#include <cstdarg>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
+#include <cstdarg>
+
 #include "app/l10n_util.h"
 #include "base/linux_util.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
 
 // Callback used in RemoveAllChildren.
 void RemoveWidget(GtkWidget* widget, gpointer container) {
   gtk_container_remove(GTK_CONTAINER(container), widget);
@@ skipping 205 matching lines @@
 bool IsScreenComposited() {
   GdkScreen* screen = gdk_screen_get_default();
   return gdk_screen_is_composited(screen) == TRUE;
 }
 
 void EnumerateTopLevelWindows(x11_util::EnumerateWindowsDelegate* delegate) {
   GdkScreen* screen = gdk_screen_get_default();
   GList* stack = gdk_screen_get_window_stack(screen);
   if (!stack) {
     // Window Manager doesn't support _NET_CLIENT_LIST_STACKING, so fall back
-    // to old school enumeration of all X windows.
-    x11_util::EnumerateAllWindows(delegate);
+    // to old school enumeration of all X windows.  Some WMs parent 'top-level'
+    // windows in unnamed actual top-level windows (ion WM), so extend the
+    // search depth to all children of top-level windows.
+    const int kMaxSearchDepth = 1;
+    x11_util::EnumerateAllWindows(delegate, kMaxSearchDepth);
     return;
   }
 
   for (GList* iter = g_list_last(stack); iter; iter = iter->prev) {
     GdkWindow* window = static_cast<GdkWindow*>(iter->data);
     if (!gdk_window_is_visible(window))
       continue;
 
     XID xid = GDK_WINDOW_XID(window);
     if (delegate->ShouldStopIterating(xid))
@@ skipping 32 matching lines @@
   //   GTK_NO_WINDOW widgets, and are relative to widget->allocation.x,
   //   widget->allocation.y for widgets that are GTK_NO_WINDOW widgets.
   //
   // So the base is always (0,0).
   gfx::Rect widget_allocation(0, 0, widget->allocation.width,
                               widget->allocation.height);
   return widget_allocation.Contains(x, y);
 }
 
 }  // namespace gtk_util