| Index: chrome/browser/chromeos/file_system_provider/service.h
|
| diff --git a/chrome/browser/chromeos/file_system_provider/service.h b/chrome/browser/chromeos/file_system_provider/service.h
|
| index d2477f5667ddcc555910013552c84e93d57739f0..290dbc8d209155ad85889a518a241518c7774926 100644
|
| --- a/chrome/browser/chromeos/file_system_provider/service.h
|
| +++ b/chrome/browser/chromeos/file_system_provider/service.h
|
| @@ -18,6 +18,7 @@
|
| #include "base/threading/thread_checker.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/chromeos/file_system_provider/observer.h"
|
| +#include "chrome/browser/chromeos/file_system_provider/provided_file_system_defs.h"
|
| #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
|
| #include "chrome/browser/chromeos/file_system_provider/provided_file_system_observer.h"
|
| #include "chrome/browser/chromeos/file_system_provider/watcher.h"
|
| @@ -94,13 +95,15 @@ class Service : public KeyedService,
|
| // tags are supported, then |supports_notify_tag| must be true. Note, that
|
| // it is required in order to enable the internal cache. For success, returns
|
| // base::File::FILE_OK, otherwise an error code.
|
| - base::File::Error MountFileSystem(const std::string& extension_id,
|
| - const MountOptions& options);
|
| + base::File::Error MountFileSystem(
|
| + const std::string& source_id,
|
| + const MountOptions& options,
|
| + Source_Type source_type = Source_Type::extension);
|
|
|
| // Unmounts a file system with the specified |file_system_id| for the
|
| // |extension_id|. For success returns base::File::FILE_OK, otherwise an error
|
| // code.
|
| - base::File::Error UnmountFileSystem(const std::string& extension_id,
|
| + base::File::Error UnmountFileSystem(const std::string& source_id,
|
| const std::string& file_system_id,
|
| UnmountReason reason);
|
|
|
| @@ -121,7 +124,7 @@ class Service : public KeyedService,
|
| // Returns a provided file system with |file_system_id|, handled by
|
| // the extension with |extension_id|. If not found, then returns NULL.
|
| ProvidedFileSystemInterface* GetProvidedFileSystem(
|
| - const std::string& extension_id,
|
| + const std::string& source_id,
|
| const std::string& file_system_id);
|
|
|
| // Returns a provided file system attached to the the passed
|
| @@ -172,9 +175,11 @@ class Service : public KeyedService,
|
|
|
| // Mounts the file system in the specified context. See MountFileSystem() for
|
| // more information.
|
| - base::File::Error MountFileSystemInternal(const std::string& extension_id,
|
| - const MountOptions& options,
|
| - MountContext context);
|
| + base::File::Error MountFileSystemInternal(
|
| + const std::string& source_id,
|
| + const MountOptions& options,
|
| + MountContext context,
|
| + Source_Type source_type = Source_Type::extension);
|
|
|
| // Called when the providing extension accepts or refuses a unmount request.
|
| // If |error| is equal to FILE_OK, then the request is accepted.
|
|
|