Don't show FileManagerDialog if another FileManagerDialog is shown in the same tab.

chrome/browser/ui/views/file_manager_dialog.h

Index: chrome/browser/ui/views/file_manager_dialog.h
diff --git a/chrome/browser/ui/views/file_manager_dialog.h b/chrome/browser/ui/views/file_manager_dialog.h
index e29afda6f5497ecd9be9f0663ec2269cd23b4f19..0feb5fda955330f19551a2fce1e10ccd667f5d9c 100644
--- a/chrome/browser/ui/views/file_manager_dialog.h
+++ b/chrome/browser/ui/views/file_manager_dialog.h
@@ -8,6 +8,7 @@
 
 #include <map>
 
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/ui/shell_dialogs.h"  // SelectFileDialog
 #include "chrome/browser/ui/views/extensions/extension_dialog_observer.h"
@@ -56,6 +57,8 @@ class FileManagerDialog
  private:
   friend class FileManagerDialogBrowserTest;
   friend class FileManagerDialogTest;
+  // This test creates an additional dialog, so we need to friend explicitly.
+  FRIEND_TEST_ALL_PREFIXES(FileManagerDialogBrowserTest, OpenTwoDialogs);

[achuithb, 2011/11/10 20:58:40]

You could add a protected method like OpenSecondDialog to
FileManagerDialogBrowserTest to avoid this friending if you like...

[tbarzic, 2011/11/10 22:00:48]

Done.

 
   // Object is ref-counted, use FileManagerDialog::Create().
   explicit FileManagerDialog(SelectFileDialog::Listener* listener);
@@ -70,6 +73,9 @@ class FileManagerDialog
   // Adds this to the list of pending dialogs, used for testing.
   void AddPending(int32 tab_id);
 
+  // Check if the list of pending dialogs contains dialog for |tab_id|.
+  bool PendingExists(int32 tab_id);

[achuithb, 2011/11/10 20:58:40]

static?

[James Cook, 2011/11/10 21:04:54]

Maybe call this IsPending()?  const?

[tbarzic, 2011/11/10 22:00:48]

Yep

[tbarzic, 2011/11/10 22:00:48]

Hm, I don't feel IsPending would be the right name (this name would be more
suitable if the method checked if this dialog is pending)
Since we are checking if there already is pending dialog in the tab,
PendingExists seems better (at least that is my opinion)..

As for const, I'd rather make it static

+
   // Returns if the dialog has mutiple file type choices
   virtual bool HasMultipleFileTypeChoicesImpl();