diff options
| author | inferno@chromium.org <inferno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 16:33:09 +0000 |
|---|---|---|
| committer | inferno@chromium.org <inferno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 16:33:09 +0000 |
| commit | 7ac3d257130915c313101d75c8783c731bcf8b8d (patch) | |
| tree | 88dcf83584288f0a9539d25eaa5438423e72a01c | |
| parent | 5cb1cc43529f260028beca6962ed16162d7351c3 (diff) | |
| download | chromium_src-7ac3d257130915c313101d75c8783c731bcf8b8d.zip chromium_src-7ac3d257130915c313101d75c8783c731bcf8b8d.tar.gz chromium_src-7ac3d257130915c313101d75c8783c731bcf8b8d.tar.bz2 | |
Merge 54763 - Handle destruction of select file dialog listener object in tab contents destructor.
BUG=45400
TEST=None
Review URL: http://codereview.chromium.org/2856082
TBR=inferno@chromium.org
Review URL: http://codereview.chromium.org/3080022
git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54766 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 5 |
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 eec010d..e0a8dc2 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -387,6 +387,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, |