Linux: Stack autocomplete popup window directly on top of the browser's toplevel window.

BUG=19082 "Linux: Omnibox auto-complete popup is on top of IME candidate window when using SCIM"
TEST=Please refer to the bug report for how to test.

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

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

1 files changed, 2 insertions, 20 deletions

diff --git a/chrome/browser/gtk/info_bubble_gtk.cc b/chrome/browser/gtk/info_bubble_gtk.cc
index 3163555..6ee8e45 100644
--- a/chrome/browser/gtk/info_bubble_gtk.cc
+++ b/chrome/browser/gtk/info_bubble_gtk.cc
@@ -260,26 +260,8 @@ void InfoBubbleGtk::MoveWindow() {
 }
 
 void InfoBubbleGtk::StackWindow() {
-  // Stack our window directly above the toplevel window.  Our 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).
-  XID toplevel_window_base = x11_util::GetHighestAncestorWindow(
-      x11_util::GetX11WindowFromGtkWidget(GTK_WIDGET(toplevel_window_)),
-      x11_util::GetX11RootWindow());
-  if (toplevel_window_base) {
-    XID window_xid = x11_util::GetX11WindowFromGtkWidget(GTK_WIDGET(window_));
-    XID window_parent = x11_util::GetParentWindow(window_xid);
-    if (window_parent == x11_util::GetX11RootWindow()) {
-      x11_util::RestackWindow(window_xid, toplevel_window_base, true);
-    } else {
-      // The window manager shouldn't reparent override-redirect windows.
-      DLOG(ERROR) << "override-redirect window " << window_xid
-                  << "'s parent is " << window_parent
-                  << ", rather than root window "
-                  << x11_util::GetX11RootWindow();
-    }
-  }
+  // Stack our window directly above the toplevel window.
+  gtk_util::StackPopupWindow(window_, GTK_WIDGET(toplevel_window_));
 }
 
 void InfoBubbleGtk::Observe(NotificationType type,