gtk: Grab server when restacking windows.

Otherwise, it's possible for the window manager
to reparent the toplevel window right before we
try to stack the first-run bubble above it,
leading to a crash (since the two windows are
no longer siblings).

BUG=30498
TEST=not yet

Review URL: http://codereview.chromium.org/545126

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36897 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc
index 62b7465..36484a3 100644
--- a/chrome/common/gtk_util.cc
+++ b/chrome/common/gtk_util.cc
@@ -662,9 +662,12 @@ void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel) {
          GTK_WIDGET_REALIZED(toplevel));
 
   // Stack the |popup| window directly above the |toplevel| window.
-  // The |popup| window is a direct child of the root window, so we need to
+  // The popup window is a direct child of the root window, so we need to
   // find a similar ancestor for the toplevel window (which might have been
-  // reparented by a window manager).
+  // reparented by a window manager).  We grab the server while we're doing
+  // this -- otherwise, we'll get an error if the window manager reparents the
+  // toplevel window right after we call GetHighestAncestorWindow().
+  gdk_x11_display_grab(gtk_widget_get_display(toplevel));
   XID toplevel_window_base = x11_util::GetHighestAncestorWindow(
       x11_util::GetX11WindowFromGtkWidget(toplevel),
       x11_util::GetX11RootWindow());
@@ -681,6 +684,7 @@ void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel) {
                   << x11_util::GetX11RootWindow();
     }
   }
+  gdk_x11_display_ungrab(gtk_widget_get_display(toplevel));
 }
 
 gfx::Rect GetWidgetRectRelativeToToplevel(GtkWidget* widget) {