cros: Defer file selection callback until the window closes.

We've had lots of trouble over the last six months with the ChromeOS extension-based file picker.  In particular, for the Windows/Mac/GTK file pickers selecting a file is synchronous with closing the dialog.  On ChromeOS, with the extension picker, it's not.  We've historically gotten into trouble with the order of deletion of all the associated objects.  This patch defers the SelectFileDialog::Listener callback until the dialog closes, to match the semantics of Win/Mac/GTK.  This allows us to use a more natural window.close() call in the file manager JavaScript, though sadly we still have to call the unload handler manually.  I also renamed ExtensionDialogIsClosing() to ExtensionDialogClosing() to match WindowClosing().

This also fixed a problem on Aura where closing the file picker by clicking the dialog "X" button resulted in the inability to reopen it.

BUG=105311
TEST=browser_test SelectFileDialog*, also navigate to a web page with <input type='file'> and be sure you can cancel with the 'X' button on Aura and reopen the dialog.


Review URL: http://codereview.chromium.org/8770028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112776 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 9 deletions

diff --git a/chrome/browser/ui/views/select_file_dialog_extension.h b/chrome/browser/ui/views/select_file_dialog_extension.h
index 9cdeab3..59f0ba2 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension.h
+++ b/chrome/browser/ui/views/select_file_dialog_extension.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_SELECT_FILE_DIALOG_EXTENSION_H_
 #pragma once
 
-#include <map>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ -31,10 +31,10 @@ class SelectFileDialogExtension
   virtual void ListenerDestroyed() OVERRIDE;
 
   // ExtensionDialog::Observer implementation.
-  virtual void ExtensionDialogIsClosing(ExtensionDialog* dialog) OVERRIDE;
+  virtual void ExtensionDialogClosing(ExtensionDialog* dialog) OVERRIDE;
 
   // Routes callback to appropriate SelectFileDialog::Listener based on
-  // the owning |tab_id|, then closes the dialog.
+  // the owning |tab_id|.
   static void OnFileSelected(int32 tab_id, const FilePath& path, int index);
   static void OnMultiFilesSelected(int32 tab_id,
                                    const std::vector<FilePath>& files);
@@ -63,11 +63,8 @@ class SelectFileDialogExtension
   explicit SelectFileDialogExtension(SelectFileDialog::Listener* listener);
   virtual ~SelectFileDialogExtension();
 
-  // Closes the dialog and cleans up callbacks and listeners.
-  void Close();
-
-  // Posts a task to close the dialog.
-  void PostTaskToClose();
+  // Invokes the appropriate file selection callback on our listener.
+  void NotifyListener();
 
   // Adds this to the list of pending dialogs, used for testing.
   void AddPending(int32 tab_id);
@@ -79,7 +76,6 @@ class SelectFileDialogExtension
   virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE;
 
   bool has_multiple_file_type_choices_;
-  void* params_;
 
   // Host for the extension that implements this dialog.
   scoped_refptr<ExtensionDialog> extension_dialog_;
@@ -89,6 +85,19 @@ class SelectFileDialogExtension
 
   gfx::NativeWindow owner_window_;
 
+  // We defer the callback into SelectFileDialog::Listener until the window
+  // closes, to match the semantics of file selection on Windows and Mac.
+  // These are the data passed to the listener.
+  enum SelectionType {
+    CANCEL = 0,
+    SINGLE_FILE,
+    MULTIPLE_FILES
+  };
+  SelectionType selection_type_;
+  std::vector<FilePath> selection_files_;
+  int selection_index_;
+  void* params_;
+
   DISALLOW_COPY_AND_ASSIGN(SelectFileDialogExtension);
 };