Move RunFileChooserHelper and EnumerateDirectoryHelper out of Browser.

chrome/browser/file_select_helper.h

 // Copyright (c) 2012 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_FILE_SELECT_HELPER_H_
 #define CHROME_BROWSER_FILE_SELECT_HELPER_H_
 #pragma once
 
 #include <map>
 #include <vector>
@@ skipping 13 matching lines @@
 }
 
 // This class handles file-selection requests coming from WebUI elements
 // (via the ExtensionHost class). It implements both the initialisation
 // and listener functions for file-selection dialogs.
 class FileSelectHelper
     : public base::RefCountedThreadSafe<FileSelectHelper>,
       public SelectFileDialog::Listener,
       public content::NotificationObserver {
  public:
-  explicit FileSelectHelper(Profile* profile);
 
   // Show the file chooser dialog.
-  void RunFileChooser(content::RenderViewHost* render_view_host,
-                      content::WebContents* tab_contents,
-                      const content::FileChooserParams& params);
+  static void RunFileChooser(content::WebContents* tab,
+                             const content::FileChooserParams& params);
 
   // Enumerates all the files in directory.
-  void EnumerateDirectory(int request_id,
-                          content::RenderViewHost* render_view_host,
-                          const FilePath& path);
+  static void EnumerateDirectory(content::WebContents* tab,
+                                 int request_id,
+                                 const FilePath& path);
 
  private:
   friend class base::RefCountedThreadSafe<FileSelectHelper>;
+  explicit FileSelectHelper(Profile* profile);
   virtual ~FileSelectHelper();
 
   // Utility class which can listen for directory lister events and relay
   // them to the main object with the correct tracking id.
   class DirectoryListerDispatchDelegate
       : public net::DirectoryLister::DirectoryListerDelegate {
    public:
     DirectoryListerDispatchDelegate(FileSelectHelper* parent, int id)
         : parent_(parent),
           id_(id) {}
     virtual ~DirectoryListerDispatchDelegate() {}
     virtual void OnListFile(
         const net::DirectoryLister::DirectoryListerData& data) OVERRIDE {
       parent_->OnListFile(id_, data);
     }
     virtual void OnListDone(int error) OVERRIDE {
       parent_->OnListDone(id_, error);
     }
    private:
     // This FileSelectHelper owns this object.
     FileSelectHelper* parent_;
     int id_;
 
     DISALLOW_COPY_AND_ASSIGN(DirectoryListerDispatchDelegate);
   };
 
+  void RunFileChooser(content::RenderViewHost* render_view_host,
+                      content::WebContents* tab_contents,
+                      const content::FileChooserParams& params);
   void RunFileChooserOnFileThread(
       const content::FileChooserParams& params);
   void RunFileChooserOnUIThread(
       const content::FileChooserParams& params);
 
   // Cleans up and releases this instance. This must be called after the last
   // callback is received from the file chooser dialog.
   void RunFileChooserEnd();
 
   // SelectFileDialog::Listener overrides.
   virtual void FileSelected(
       const FilePath& path, int index, void* params) OVERRIDE;
   virtual void FileSelectedWithExtraInfo(
       const content::SelectedFileInfo& file,
       int index,
       void* params) OVERRIDE;
   virtual void MultiFilesSelected(const std::vector<FilePath>& files,
                                   void* params) OVERRIDE;
   virtual void MultiFilesSelectedWithExtraInfo(
       const std::vector<content::SelectedFileInfo>& files,
       void* params) OVERRIDE;
   virtual void FileSelectionCanceled(void* params) OVERRIDE;
 
   // content::NotificationObserver overrides.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  void EnumerateDirectory(int request_id,
+                          content::RenderViewHost* render_view_host,
+                          const FilePath& path);
+
   // Kicks off a new directory enumeration.
   void StartNewEnumeration(const FilePath& path,
                            int request_id,
                            content::RenderViewHost* render_view_host);
 
   // Callbacks from directory enumeration.
   virtual void OnListFile(
       int id,
       const net::DirectoryLister::DirectoryListerData& data);
   virtual void OnListDone(int id, int error);
@@ skipping 30 matching lines @@
   struct ActiveDirectoryEnumeration;
   std::map<int, ActiveDirectoryEnumeration*> directory_enumerations_;
 
   // Registrar for notifications regarding our RenderViewHost.
   content::NotificationRegistrar notification_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSelectHelper);
 };
 
 #endif  // CHROME_BROWSER_FILE_SELECT_HELPER_H_