Move OnFileSystemMounted/BeingUnmounted to VolumeManager.

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 "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
+#include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 
 class Profile;
 
 namespace chromeos {
 class PowerManagerClient;
 }  // namespace chromeos
 
 namespace content {
 class BrowserContext;
 }  // namespace content
 
+namespace drive {
+class DriveIntegrationService;
+}  // namespace drive
+
 namespace file_manager {
 
 class MountedDiskMonitor;
 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,
@@ skipping 28 matching lines @@
   base::FilePath system_path_prefix;
 
   // If disk is a parent, then its label, else parents label.
   // (e.g. "TransMemory")
   std::string drive_label;
 
   // Is the device is a parent device (i.e. sdb rather than sdb1).
   bool is_parent;
 };
 
-// Returns the VolumeInfo for Drive file system.
-// This is temporarily exposed for EventRouter's FileSystem mounting event
-// handling.
-// TODO(hidehiko): Hide this when the observing code is moved to VolumeManager.
-VolumeInfo CreateDriveVolumeInfo();
-
 // 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 BrowserContextKeyedService,
+                      public drive::DriveIntegrationServiceObserver,
                       public chromeos::disks::DiskMountManager::Observer {
  public:
   VolumeManager(Profile* profile,
+                drive::DriveIntegrationService* drive_integration_service,
                 chromeos::PowerManagerClient* power_manager_client,
                 chromeos::disks::DiskMountManager* disk_mount_manager);
   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;
 
   // Adds an observer.
   void AddObserver(VolumeManagerObserver* observer);
 
   // Removes the observer.
   void RemoveObserver(VolumeManagerObserver* observer);
 
   // Returns the information about all volumes currently mounted.
-  // TODO(hidehiko): make this just an accessor.
   std::vector<VolumeInfo> GetVolumeInfoList() const;
 
+  // drive::DriveIntegrationServiceObserver overrides.
+  virtual void OnFileSystemMounted() OVERRIDE;
+  virtual void OnFileSystemBeingUnmounted() OVERRIDE;
+
   // chromeos::disks::DiskMountManager::Observer overrides.
   virtual void OnDiskEvent(
       chromeos::disks::DiskMountManager::DiskEvent event,
       const chromeos::disks::DiskMountManager::Disk* disk) OVERRIDE;
   virtual void OnDeviceEvent(
       chromeos::disks::DiskMountManager::DeviceEvent event,
       const std::string& device_path) OVERRIDE;
   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;
 
   // Called on change to kExternalStorageDisabled pref.
   void OnExternalStorageDisabledChanged();
 
  private:
   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_;
   DISALLOW_COPY_AND_ASSIGN(VolumeManager);
 };
 
 }  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_VOLUME_MANAGER_H_