diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 22:56:17 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 22:56:17 +0000 |
commit | 2a021c45241b0556918f42df51709fdd7ff7a4fa (patch) | |
tree | ccc1ed736029022b7aed62a0d76a9ecdebe3b033 /chrome/browser/ui/gtk/gtk_util.cc | |
parent | e091b14467c3329a64c47b96bf6bbb75c0a5e4d5 (diff) | |
download | chromium_src-2a021c45241b0556918f42df51709fdd7ff7a4fa.zip chromium_src-2a021c45241b0556918f42df51709fdd7ff7a4fa.tar.gz chromium_src-2a021c45241b0556918f42df51709fdd7ff7a4fa.tar.bz2 |
Convert some WidgetWin construction to use CreateParams.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6719006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/gtk_util.cc')
-rw-r--r-- | chrome/browser/ui/gtk/gtk_util.cc | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index 34bbef0..256b838 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -862,38 +862,6 @@ void SetAlwaysShowImage(GtkWidget* image_menu_item) { #endif } -void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel) { - DCHECK(GTK_IS_WINDOW(popup) && GTK_WIDGET_TOPLEVEL(popup) && - GTK_WIDGET_REALIZED(popup)); - DCHECK(GTK_IS_WINDOW(toplevel) && GTK_WIDGET_TOPLEVEL(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 - // find a similar ancestor for the toplevel window (which might have been - // 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 = ui::GetHighestAncestorWindow( - ui::GetX11WindowFromGtkWidget(toplevel), - ui::GetX11RootWindow()); - if (toplevel_window_base) { - XID window_xid = ui::GetX11WindowFromGtkWidget(popup); - XID window_parent = ui::GetParentWindow(window_xid); - if (window_parent == ui::GetX11RootWindow()) { - ui::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 " - << ui::GetX11RootWindow(); - } - } - gdk_x11_display_ungrab(gtk_widget_get_display(toplevel)); -} - gfx::Rect GetWidgetRectRelativeToToplevel(GtkWidget* widget) { DCHECK(GTK_WIDGET_REALIZED(widget)); |