Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7637)

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_util.cc

Issue 328683004: Merge 270621 "Fixes the crash when the transient parent is NULL." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1985/src/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_util.h ('k') | chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/gtk2_util.cc
===================================================================
--- chrome/browser/ui/libgtk2ui/gtk2_util.cc (revision 276072)
+++ chrome/browser/ui/libgtk2ui/gtk2_util.cc (working copy)
@@ -103,9 +103,10 @@
return flags;
}
-// Set |dialog| as transient for |parent|, which will keep it on top and center
-// it above |parent|.
void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent) {
+ if (!parent)
+ return;
+
gtk_widget_realize(dialog);
GdkWindow* gdk_window = gtk_widget_get_window(dialog);
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_util.h ('k') | chrome/browser/ui/libgtk2ui/print_dialog_gtk2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698