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

chrome/browser/ui/views/file_manager_dialog.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FILE_MANAGER_DIALOG_H_
 #define CHROME_BROWSER_UI_VIEWS_FILE_MANAGER_DIALOG_H_
 #pragma once
 
 #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"
 #include "ui/gfx/native_widget_types.h"  // gfx::NativeWindow
 
 class ExtensionDialog;
 class RenderViewHost;
 
 // Shows a dialog box for selecting a file or a folder, using the
 // file manager extension implementation.
@@ skipping 28 matching lines @@
                               const FileTypeInfo* file_types,
                               int file_type_index,
                               const FilePath::StringType& default_extension,
                               gfx::NativeWindow owning_window,
                               void* params) OVERRIDE;
 
 
  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);
   virtual ~FileManagerDialog();
 
   // Closes the dialog and cleans up callbacks and listeners.
   void Close();
 
   // Posts a task to close the dialog.
   void PostTaskToClose();
 
   // 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();
 
   bool hasMultipleFileTypeChoices_;
   void* params_;
 
   // Host for the extension that implements this dialog.
   scoped_refptr<ExtensionDialog> extension_dialog_;
 
   // ID of the tab that spawned this dialog, used to route callbacks.
   int32 tab_id_;
 
   gfx::NativeWindow owner_window_;
 
   DISALLOW_COPY_AND_ASSIGN(FileManagerDialog);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FILE_MANAGER_DIALOG_H_