summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorinferno@chromium.org <inferno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 16:29:59 +0000
committerinferno@chromium.org <inferno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 16:29:59 +0000
commitbc4c7e6c6621e82a550bf23f798034b6b51ab4c1 (patch)
treedfbbb3035cc099d8eab420a9c04790143cc9b389
parent32a69cf04fe60cf9bfa6fe4e63a4dc0069b2d080 (diff)
downloadchromium_src-bc4c7e6c6621e82a550bf23f798034b6b51ab4c1.zip
chromium_src-bc4c7e6c6621e82a550bf23f798034b6b51ab4c1.tar.gz
chromium_src-bc4c7e6c6621e82a550bf23f798034b6b51ab4c1.tar.bz2
Handle destruction of select file dialog listener object in tab contents destructor.
BUG=45400 TEST=None Review URL: http://codereview.chromium.org/2856082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54763 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 0111447..83bd9c4 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -389,6 +389,11 @@ TabContents::~TabContents() {
if (blocked_popups_)
blocked_popups_->Destroy();
+ // There may be pending file dialogs, we need to tell them that we've gone
+ // away so they don't try and call back to us.
+ if (select_file_dialog_.get())
+ select_file_dialog_->ListenerDestroyed();
+
// Notify any observer that have a reference on this tab contents.
NotificationService::current()->Notify(
NotificationType::TAB_CONTENTS_DESTROYED,