From 7e83ae2b7e7782f91479bb8d1a609bda113bf36b Mon Sep 17 00:00:00 2001 From: "glotov@google.com" Date: Tue, 31 May 2011 11:58:49 +0000 Subject: Removing DeleteSoon() from WigetGtk so it behaves like WidgetWin This is a retry of http://codereview.chromium.org/7002029/ after it has been reverted because of the failing test BrowserTest.CloseWithAppMenuOpen (failed only on buildbot) BUG=chromium-os:15129 TEST=tests Review URL: http://codereview.chromium.org/7082042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87294 0039d316-1c4b-4281-b951-d872f2087c98 --- views/window/native_window_gtk.cc | 5 ++++- views/window/native_window_gtk.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'views/window') diff --git a/views/window/native_window_gtk.cc b/views/window/native_window_gtk.cc index a2bf870..cf09524 100644 --- a/views/window/native_window_gtk.cc +++ b/views/window/native_window_gtk.cc @@ -362,7 +362,11 @@ void NativeWindowGtk::SaveWindowPosition() { void NativeWindowGtk::OnDestroy(GtkWidget* widget) { delegate_->OnNativeWindowDestroying(); NativeWidgetGtk::OnDestroy(widget); +} + +void NativeWindowGtk::OnDestroyed(GObject *where_the_object_was) { delegate_->OnNativeWindowDestroyed(); + NativeWidgetGtk::OnDestroyed(where_the_object_was); } //////////////////////////////////////////////////////////////////////////////// @@ -375,4 +379,3 @@ NativeWindow* NativeWindow::CreateNativeWindow( } } // namespace views - diff --git a/views/window/native_window_gtk.h b/views/window/native_window_gtk.h index 1d7a773..6516b33 100644 --- a/views/window/native_window_gtk.h +++ b/views/window/native_window_gtk.h @@ -78,6 +78,7 @@ class NativeWindowGtk : public NativeWidgetGtk, public NativeWindow { friend class Window; virtual void OnDestroy(GtkWidget* widget); + virtual void OnDestroyed(GObject *where_the_object_was); private: static gboolean CallConfigureEvent(GtkWidget* widget, -- cgit v1.1