Switch from MountLibrary to CrosDisksLibrary

chrome/browser/extensions/extension_file_browser_private_api.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_EXTENSIONS_EXTENSION_FILE_BROWSER_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FILE_BROWSER_PRIVATE_API_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/platform_file.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "googleurl/src/url_util.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 
 #ifdef OS_CHROMEOS
-#include "chrome/browser/chromeos/cros/mount_library.h"
+#include "chrome/browser/chromeos/disks/disk_mount_manager.h"
 #endif
 
 class GURL;
 
 // Implements the chrome.fileBrowserPrivate.requestLocalFileSystem method.
 class RequestLocalFileSystemFunction : public AsyncExtensionFunction {
  protected:
-  friend class LocalFileSystemCallbackDispatcher;
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
+
+ private:
+  class LocalFileSystemCallbackDispatcher;
+
   void RespondSuccessOnUIThread(const std::string& name,
                                 const GURL& root_path);
   void RespondFailedOnUIThread(base::PlatformFileError error_code);
   void RequestOnFileThread(const GURL& source_url, int child_id);
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.requestLocalFileSystem");
 };
 
 // Implements the chrome.fileBrowserPrivate.addFileWatch method.
 class FileWatchBrowserFunctionBase : public AsyncExtensionFunction {
  protected:
@@ skipping 52 matching lines @@
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
  private:
   struct FileDefinition {
     GURL target_file_url;
     FilePath virtual_path;
     bool is_directory;
   };
   typedef std::vector<FileDefinition> FileDefinitionList;
-  friend class ExecuteTasksFileSystemCallbackDispatcher;
+  class ExecuteTasksFileSystemCallbackDispatcher;
   // Initates execution of context menu tasks identified with |task_id| for
   // each element of |files_list|.
   bool InitiateFileTaskExecution(const std::string& task_id,
                                  base::ListValue* files_list);
   void RequestFileEntryOnFileThread(const GURL& source_url,
                                     const std::string& task_id,
                                     const std::vector<GURL>& file_urls);
   void RespondFailedOnUIThread(base::PlatformFileError error_code);
   void ExecuteFileActionsOnUIThread(const std::string& task_id,
                                     const std::string& file_system_name,
                                     const GURL& file_system_root,
                                     const FileDefinitionList& file_list);
   void ExecuteFailedOnUIThread();
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.executeTask");
 };
 
 // Parent class for the chromium extension APIs for the file dialog.
 class FileBrowserFunction
     : public AsyncExtensionFunction {
  public:
   FileBrowserFunction();
 
  protected:
   typedef std::vector<GURL> UrlList;
   typedef std::vector<FilePath> FilePathList;
+  typedef base::Callback<void(const FilePathList&)> GetLocalPathsCallback;
 
   virtual ~FileBrowserFunction();
 
-  // Convert virtual paths to local paths on the file thread.
-  void GetLocalPathsOnFileThread(const UrlList& file_urls,
-                                 void* context);
-
-  // Callback with converted local paths.
-  virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files,
-                                               void* context) {}
+  // Convert virtual paths to local paths

[satorux1, 2011/11/16 06:46:06]

period is missing. looking at the implementation, this function does something a
bit tricky. Please describe a bit more details about what the function does.

[hashimoto, 2011/11/16 07:45:32]

Done.

+  void GetLocalPaths(const UrlList& file_urls, GetLocalPathsCallback callback);
 
   // Figure out the tab_id of the hosting tab.
   int32 GetTabId() const;
+
+ private:
+  void GetLocalPathsOnFileThread(const UrlList& file_urls,

[satorux1, 2011/11/16 06:46:06]

function comment is missing.

[hashimoto, 2011/11/16 07:45:32]

Done.

+                                 GetLocalPathsCallback callback);
 };
 
 // Select a single file.  Closes the dialog window.
 class SelectFileFunction
     : public FileBrowserFunction {
  public:
   SelectFileFunction() {}
 
  protected:
   virtual ~SelectFileFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
-  // FileBrowserFunction overrides.
-  virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files,
-                                               void* context) OVERRIDE;
+ private:
+  void GetLocalPathsResponseOnUIThread(const FilePathList& files);

[satorux1, 2011/11/16 06:46:06]

ditto.

[hashimoto, 2011/11/16 07:45:32]

Done.

 
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.selectFile");
 };
 
 // View multiple selected files.  Window stays open.
 class ViewFilesFunction
     : public FileBrowserFunction {
  public:
   ViewFilesFunction();
 
  protected:
   virtual ~ViewFilesFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
-  // FileBrowserFunction overrides.
-  virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files,
-                                               void* context) OVERRIDE;
+ private:
+  void GetLocalPathsResponseOnUIThread(const std::string& internal_task_id,

[satorux1, 2011/11/16 06:46:06]

ditto.

[hashimoto, 2011/11/16 07:45:32]

Done.

+                                       const FilePathList& files);
 
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.viewFiles");
 };
 
 // Select multiple files.  Closes the dialog window.
 class SelectFilesFunction
     : public FileBrowserFunction {
  public:
   SelectFilesFunction();
 
  protected:
   virtual ~SelectFilesFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
-  // FileBrowserFunction overrides.
-  virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files,
-                                               void* context) OVERRIDE;
+ private:
+  void GetLocalPathsResponseOnUIThread(const FilePathList& files);

[satorux1, 2011/11/16 06:46:06]

ditto

[hashimoto, 2011/11/16 07:45:32]

Done.

 
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.selectFiles");
 };
 
 // Cancel file selection Dialog.  Closes the dialog window.
 class CancelFileDialogFunction
     : public FileBrowserFunction {
  public:
   CancelFileDialogFunction() {}
 
  protected:
   virtual ~CancelFileDialogFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
  private:
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.cancelDialog");
 };
 
 // Mount a device or a file.
 class AddMountFunction
     : public FileBrowserFunction {
  public:
   AddMountFunction();
 
  protected:
   virtual ~AddMountFunction();
 
+  // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
-  // FileBrowserFunction overrides.
-  virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files,
-                                               void* context) OVERRIDE;
-
  private:
-#if defined(OS_CHROMEOS)
-  struct MountParamaters {
-    MountParamaters(const std::string& type,
-                    const chromeos::MountPathOptions& options)
-        :  mount_type(type), mount_options(options) {}
-    ~MountParamaters() {}
-    std::string mount_type;
-    chromeos::MountPathOptions mount_options;
-  };
-#endif
+  void GetLocalPathsResponseOnUIThread(const std::string& mount_type_str,
+                                       const FilePathList& files);
 
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.addMount");
 };
 
 // Unmounts selected device. Expects mount point path as an argument.
 class RemoveMountFunction
     : public FileBrowserFunction {
  public:
   RemoveMountFunction();
 
  protected:
   virtual ~RemoveMountFunction();
 
-  // FileBrowserFunction overrides.
+  // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
-  virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files,
-                                               void* context) OVERRIDE;
 
  private:
+  void GetLocalPathsResponseOnUIThread(const FilePathList& files);
+
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.removeMount");
 };
 
 class GetMountPointsFunction
     : public AsyncExtensionFunction {
  public:
   GetMountPointsFunction();
 
  protected:
   virtual ~GetMountPointsFunction();
 
+  // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
  private:
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.getMountPoints");
 };
 
 // Formats Device given its mount path.
 class FormatDeviceFunction
     : public FileBrowserFunction {
  public:
   FormatDeviceFunction();
 
  protected:
   virtual ~FormatDeviceFunction();
 
+  // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
-// FileBrowserFunction overrides.
-  virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files,
-                                               void* context) OVERRIDE;
+ private:
+  void GetLocalPathsResponseOnUIThread(const FilePathList& files);
 
- private:
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.formatDevice");
 };
 
 class GetSizeStatsFunction
     : public FileBrowserFunction {
  public:
   GetSizeStatsFunction();
 
  protected:
   virtual ~GetSizeStatsFunction();
 
-  // FileBrowserFunction overrides.
+  // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
-  virtual void GetLocalPathsResponseOnUIThread(const FilePathList& files,
-                                               void* context) OVERRIDE;
 
  private:
-  void GetSizeStatsCallbackOnUIThread(const char* mount_path,
+  void GetLocalPathsResponseOnUIThread(const FilePathList& files);
+
+  void GetSizeStatsCallbackOnUIThread(const std::string& mount_path,
                                       size_t total_size_kb,
                                       size_t remaining_size_kb);
-  void CallGetSizeStatsOnFileThread(const char* mount_path);
+  void CallGetSizeStatsOnFileThread(const std::string& mount_path);
 
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.getSizeStats");
 };
 
 // Retrieves devices meta-data. Expects volume's device path as an argument.
 class GetVolumeMetadataFunction
     : public SyncExtensionFunction {
  public:
   GetVolumeMetadataFunction();
 
@@ skipping 19 matching lines @@
   virtual ~FileDialogStringsFunction() {}
 
   // SyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
  private:
   DECLARE_EXTENSION_FUNCTION_NAME("fileBrowserPrivate.getStrings");
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FILE_BROWSER_PRIVATE_API_H_