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

Unified Diff: views/widget/native_widget_gtk.cc

Issue 7313027: Fix crashes in EnterpriseEnrollmentScreenTest.TestCancel. This is independent of any tfarina-indu... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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
Index: views/widget/native_widget_gtk.cc
===================================================================
--- views/widget/native_widget_gtk.cc (revision 91728)
+++ views/widget/native_widget_gtk.cc (working copy)
@@ -393,12 +393,15 @@
}
NativeWidgetGtk::~NativeWidgetGtk() {
- DCHECK(widget_ == NULL);
// We need to delete the input method before calling DestroyRootView(),
// because it'll set focus_manager_ to NULL.
input_method_.reset();
- if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
+ if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET) {
+ DCHECK(widget_ == NULL);
delete delegate_;
+ } else {
+ CloseNow();
+ }
}
GtkWindow* NativeWidgetGtk::GetTransientParent() const {
« no previous file with comments | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc ('k') | views/widget/native_widget_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698