summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-28 02:43:51 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-28 02:43:51 +0000
commitcecc74b7ce0d443998830809938d513b533d0836 (patch)
treeb1f2b93f51dfa85f7f27fedda3d688660e37b977
parent7e75435ab2333273b5312176ee98d37b04b3a27d (diff)
downloadchromium_src-cecc74b7ce0d443998830809938d513b533d0836.zip
chromium_src-cecc74b7ce0d443998830809938d513b533d0836.tar.gz
chromium_src-cecc74b7ce0d443998830809938d513b533d0836.tar.bz2
CrOS - Fix file browser dialog open/save/cancel
Need to release our smart pointer reference to the dialog to allow it to close in response to a window.close(). BUG=chromium-os:15870 TEST=Hit control-O. Verify you can cancel. Verify you can open a file. Review URL: http://codereview.chromium.org/7087013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87144 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/file_manager_dialogs.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/file_manager_dialogs.cc b/chrome/browser/ui/views/file_manager_dialogs.cc
index 297e5ed..0c3dd5e 100644
--- a/chrome/browser/ui/views/file_manager_dialogs.cc
+++ b/chrome/browser/ui/views/file_manager_dialogs.cc
@@ -95,6 +95,8 @@ void FileManagerDialog::ListenerDestroyed() {
void FileManagerDialog::ExtensionDialogIsClosing(ExtensionDialog* dialog) {
owner_window_ = NULL;
+ // Release our reference to the dialog to allow it to close.
+ extension_dialog_ = NULL;
FileDialogFunction::Callback::Remove(tab_id_);
}