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

Unified Diff: chrome/browser/ui/gtk/apps/native_app_window_gtk.cc

Issue 50073003: Fix crash on Linux when a normal window is created after a hidden window. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: with review comments Created 7 years, 2 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/apps/app_crash_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
index df7a764d5572a210c45057893f4439496ab9b35c..d96668479201ad653eeb3c93a3fe1aeb76db42e0 100644
--- a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
+++ b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
@@ -312,6 +312,7 @@ GdkFilterReturn NativeAppWindowGtk::OnXEvent(GdkXEvent* gdk_x_event,
if (x_event->type == PropertyNotify &&
x_event->xproperty.atom == atom_cache_.GetAtom("_NET_WM_STATE") &&
+ GTK_WIDGET(window_)->window &&
ui::GetAtomArrayProperty(GDK_WINDOW_XWINDOW(GTK_WIDGET(window_)->window),
"_NET_WM_STATE",
&atom_list)) {
« no previous file with comments | « chrome/browser/apps/app_crash_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698