[fsp] Introduce file_system_provider::Service class for the FileSystemProvider API.

chrome/browser/chromeos/file_manager/volume_manager.h

 // Copyright 2013 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_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/chromeos/file_system_provider/observer.h"
+#include "chrome/browser/chromeos/file_system_provider/service.h"
 #include "chrome/browser/local_discovery/storage/privet_volume_lister.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class Profile;
 
 namespace chromeos {
 class PowerManagerClient;
 }  // namespace chromeos
@@ skipping 12 matching lines @@
 class VolumeManagerObserver;
 
 // This manager manages "Drive" and "Downloads" in addition to disks managed
 // by DiskMountManager.
 enum VolumeType {
   VOLUME_TYPE_GOOGLE_DRIVE,
   VOLUME_TYPE_DOWNLOADS_DIRECTORY,
   VOLUME_TYPE_REMOVABLE_DISK_PARTITION,
   VOLUME_TYPE_MOUNTED_ARCHIVE_FILE,
   VOLUME_TYPE_CLOUD_DEVICE,
+  VOLUME_TYPE_PROVIDED,

[satorux1, 2014/03/26 07:55:37]

could you add a comment about the new enum? this one looks rather cryptic
compared to others.

[mtomasz, 2014/03/26 09:21:43]

Done.

   VOLUME_TYPE_TESTING
 };
 
 struct VolumeInfo {
   VolumeInfo();
   ~VolumeInfo();
 
   // The ID of the volume.
   std::string volume_id;
 
@@ skipping 34 matching lines @@
 };
 
 // Manages "Volume"s for file manager. Here are "Volume"s.
 // - Drive File System (not yet supported).
 // - Downloads directory.
 // - Removable disks (volume will be created for each partition, not only one
 //   for a device).
 // - Mounted zip archives.
 class VolumeManager : public KeyedService,
                       public drive::DriveIntegrationServiceObserver,
-                      public chromeos::disks::DiskMountManager::Observer {
+                      public chromeos::disks::DiskMountManager::Observer,
+                      public chromeos::file_system_provider::Observer {
  public:
-  VolumeManager(Profile* profile,
-                drive::DriveIntegrationService* drive_integration_service,
-                chromeos::PowerManagerClient* power_manager_client,
-                chromeos::disks::DiskMountManager* disk_mount_manager);
+  VolumeManager(
+      Profile* profile,
+      drive::DriveIntegrationService* drive_integration_service,
+      chromeos::PowerManagerClient* power_manager_client,
+      chromeos::disks::DiskMountManager* disk_mount_manager,
+      chromeos::file_system_provider::Service* file_system_provider_service);
   virtual ~VolumeManager();
 
   // Returns the instance corresponding to the |context|.
   static VolumeManager* Get(content::BrowserContext* context);
 
   // Intializes this instance.
   void Initialize();
 
   // Disposes this instance.
   virtual void Shutdown() OVERRIDE;
@@ skipping 36 matching lines @@
   virtual void OnMountEvent(
       chromeos::disks::DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
       const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
       OVERRIDE;
   virtual void OnFormatEvent(
       chromeos::disks::DiskMountManager::FormatEvent event,
       chromeos::FormatError error_code,
       const std::string& device_path) OVERRIDE;
 
+  // chromeos::file_system_provider::Observer overrides.
+  virtual void OnProvidedFileSystemRegistered(
+      const chromeos::file_system_provider::ProvidedFileSystem& file_system)
+      OVERRIDE;
+  virtual void OnProvidedFileSystemUnregistered(
+      const chromeos::file_system_provider::ProvidedFileSystem& file_system)
+      OVERRIDE;
+
   // Called on change to kExternalStorageDisabled pref.
   void OnExternalStorageDisabledChanged();
 
  private:
   void OnPrivetVolumesAvailable(
       const local_discovery::PrivetVolumeLister::VolumeList& volumes);
   void DoMountEvent(chromeos::MountError error_code,
                     const VolumeInfo& volume_info,
                     bool is_remounting);
   void DoUnmountEvent(chromeos::MountError error_code,
                       const VolumeInfo& volume_info);
 
   Profile* profile_;
   drive::DriveIntegrationService* drive_integration_service_;
   chromeos::disks::DiskMountManager* disk_mount_manager_;
   scoped_ptr<MountedDiskMonitor> mounted_disk_monitor_;
   PrefChangeRegistrar pref_change_registrar_;
   ObserverList<VolumeManagerObserver> observers_;
   scoped_ptr<local_discovery::PrivetVolumeLister> privet_volume_lister_;
+  chromeos::file_system_provider::Service* file_system_provider_service_;

[satorux1, 2014/03/26 07:55:37]

Please add a comment about who owns this object.

[mtomasz, 2014/03/26 09:21:43]

It is owned very deeply by BrowserContextKeyedServiceFactory, which is a
singleton freed on process termination. Same for #192. Added some comments.

[satorux1, 2014/03/27 04:38:55]

Thanks. I was interested in whether or not if this object is owned by this
class. Maybe:

// Not owned by this class.

was sufficient.

[mtomasz, 2014/03/27 04:43:33]

Done.

 
   std::map<std::string, VolumeInfo> mounted_volumes_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeManager);
 };
 
 }  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_