summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-12 11:16:01 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-12 11:16:01 +0000
commit9026425611e977156f61129d99d53779c0619570 (patch)
tree5e4a9d419cf4dce792e77d5b57bdc347e5ec3c7d /chrome/browser
parent4d79d76ed8e6a450fe5fdb5d7e2c539dbe5c6462 (diff)
downloadchromium_src-9026425611e977156f61129d99d53779c0619570.zip
chromium_src-9026425611e977156f61129d99d53779c0619570.tar.gz
chromium_src-9026425611e977156f61129d99d53779c0619570.tar.bz2
Fix a Linux Omnibox bug where a widget was used after it was destroyed.
Review URL: http://codereview.chromium.org/42073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rwxr-xr-xchrome/browser/autocomplete/autocomplete_popup_view_gtk.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
index 42f57aa..94a5cdf 100755
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
@@ -45,6 +45,10 @@ AutocompletePopupViewGtk::AutocompletePopupViewGtk(
}
AutocompletePopupViewGtk::~AutocompletePopupViewGtk() {
+ // Explicitly destroy our model here, before we destroy our GTK widgets.
+ // This is because the model destructor can call back into us, and we need
+ // to make sure everything is still valid when it does.
+ model_.reset();
if (vbox_)
gtk_widget_destroy(vbox_);
gtk_widget_destroy(window_);