mediaview: Mount ARC documents provider file system volumes.

chrome/browser/chromeos/file_manager/volume_manager.cc

 // 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.
 
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
+#include "chrome/browser/chromeos/arc/fileapi/arc_documents_provider_util.h"
+#include "chrome/browser/chromeos/arc/fileapi/arc_file_system_service.h"
+#include "chrome/browser/chromeos/arc/fileapi/arc_media_view_util.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/chromeos/file_manager/snapshot_manager.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 75 matching lines @@
     case VOLUME_TYPE_DOWNLOADS_DIRECTORY:
       return "downloads";
     case VOLUME_TYPE_REMOVABLE_DISK_PARTITION:
       return "removable";
     case VOLUME_TYPE_MOUNTED_ARCHIVE_FILE:
       return "archive";
     case VOLUME_TYPE_PROVIDED:
       return "provided";
     case VOLUME_TYPE_MTP:
       return "mtp";
+    case VOLUME_TYPE_MEDIA_VIEW:
+      return "media_view";
     case VOLUME_TYPE_TESTING:
       return "testing";
     case NUM_VOLUME_TYPE:
       break;
   }
   NOTREACHED();
   return "";
 }
 
 // Generates a unique volume ID for the given volume info.
@@ skipping 140 matching lines @@
   volume->is_read_only_ = read_only;
   volume->volume_id_ = kMtpVolumeIdPrefix + label;
   volume->volume_label_ = label;
   volume->source_path_ = mount_path;
   volume->source_ = SOURCE_DEVICE;
   volume->device_type_ = chromeos::DEVICE_TYPE_MOBILE;
   return volume;
 }
 
 // static
+Volume* Volume::CreateForMediaView(const std::string& root_document_id) {
+  Volume* const volume = new Volume;
+  volume->type_ = VOLUME_TYPE_MEDIA_VIEW;
+  volume->device_type_ = chromeos::DEVICE_TYPE_UNKNOWN;
+  volume->source_ = SOURCE_SYSTEM;
+  volume->mount_path_ = arc::GetDocumentsProviderMountPath(
+      arc::kMediaDocumentsProviderAuthority, root_document_id);
+  volume->mount_condition_ = chromeos::disks::MOUNT_CONDITION_NONE;
+  volume->volume_label_ = root_document_id;
+  volume->is_read_only_ = true;
+  volume->watchable_ = false;
+  volume->volume_id_ = arc::GetMediaViewVolumeId(root_document_id);
+  return volume;
+}
+
+// static
 Volume* Volume::CreateForTesting(const base::FilePath& path,
                                  VolumeType volume_type,
                                  chromeos::DeviceType device_type,
                                  bool read_only) {
   Volume* const volume = new Volume;
   volume->type_ = volume_type;
   volume->device_type_ = device_type;
   // Keep source_path empty.
   volume->source_ = SOURCE_DEVICE;
   volume->mount_path_ = path;
@@ skipping 91 matching lines @@
       prefs::kExternalStorageReadOnly,
       base::Bind(&VolumeManager::OnExternalStorageReadOnlyChanged,
                  weak_ptr_factory_.GetWeakPtr()));
 
   // Subscribe to storage monitor for MTP notifications.
   if (storage_monitor::StorageMonitor::GetInstance()) {
     storage_monitor::StorageMonitor::GetInstance()->EnsureInitialized(
         base::Bind(&VolumeManager::OnStorageMonitorInitialized,
                    weak_ptr_factory_.GetWeakPtr()));
   }
+
+  // Subscribe to ARC events.
+  if (base::FeatureList::IsEnabled(arc::kMediaViewFeature) &&
+      arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
+    arc::ArcServiceManager::Get()->AddObserver(this);
+    arc::ArcServiceManager::Get()->file_system_service()->AddObserver(this);
+  }
 }
 
 void VolumeManager::Shutdown() {
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   snapshot_manager_.reset();
   pref_change_registrar_.RemoveAll();
   disk_mount_manager_->RemoveObserver(this);
   if (storage_monitor::StorageMonitor::GetInstance())
     storage_monitor::StorageMonitor::GetInstance()->RemoveObserver(this);
@@ skipping 300 matching lines @@
   // Repeat until unmount all paths
   const std::string& mount_path =
       disk_mount_manager_->mount_points().begin()->second.mount_path;
   disk_mount_manager_->UnmountPath(
       mount_path, chromeos::UNMOUNT_OPTIONS_NONE,
       base::Bind(
           &VolumeManager::OnExternalStorageDisabledChangedUnmountCallback,
           weak_ptr_factory_.GetWeakPtr()));
 }
 
+void VolumeManager::OnFileSystemsReady() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DCHECK(base::FeatureList::IsEnabled(arc::kMediaViewFeature));
+  DCHECK(arc::ArcSessionManager::IsAllowedForProfile(profile_));
+
+  DoMountEvent(chromeos::MOUNT_ERROR_NONE,
+               linked_ptr<Volume>(
+                   Volume::CreateForMediaView(arc::kImagesRootDocumentId)));
+  DoMountEvent(chromeos::MOUNT_ERROR_NONE,
+               linked_ptr<Volume>(
+                   Volume::CreateForMediaView(arc::kVideosRootDocumentId)));
+  DoMountEvent(chromeos::MOUNT_ERROR_NONE,
+               linked_ptr<Volume>(
+                   Volume::CreateForMediaView(arc::kAudioRootDocumentId)));
+}
+
+void VolumeManager::OnArcShutdown() {

[Luis Héctor Chávez, 2017/01/10 18:51:35]

Unfortunately this was reverted :(

[Shuhei Takahashi, 2017/01/11 15:20:43]

Thanks for heads-up. Rebased on tot.

+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  DCHECK(base::FeatureList::IsEnabled(arc::kMediaViewFeature));
+  DCHECK(arc::ArcSessionManager::IsAllowedForProfile(profile_));
+
+  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,

[Luis Héctor Chávez, 2017/01/10 18:51:35]

What happens if OnFileSystemsReady() was never called?

[Shuhei Takahashi, 2017/01/11 15:20:43]

It is okay to call DoUnmountEvent() even if mounts do not exist.

+                 linked_ptr<Volume>(
+                     Volume::CreateForMediaView(arc::kImagesRootDocumentId)));
+  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
+                 linked_ptr<Volume>(
+                     Volume::CreateForMediaView(arc::kVideosRootDocumentId)));
+  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
+                 linked_ptr<Volume>(
+                     Volume::CreateForMediaView(arc::kAudioRootDocumentId)));
+
+  // Unsubscribe from ARC events.
+  arc::ArcServiceManager::Get()->RemoveObserver(this);
+  arc::ArcServiceManager::Get()->file_system_service()->RemoveObserver(this);

[Luis Héctor Chávez, 2017/01/10 18:51:35]

nit: unsubscribe in the reverse order in which you subscribed.

[Shuhei Takahashi, 2017/01/11 15:20:43]

Done (actually we now observe only one instance).

+}
+
 void VolumeManager::OnExternalStorageDisabledChanged() {
   // If the policy just got disabled we have to unmount every device currently
   // mounted. The opposite is fine - we can let the user re-plug their device to
   // make it available.
   if (profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
     // We do not iterate on mount_points directly, because mount_points can
     // be changed by UnmountPath().
     // TODO(hidehiko): Is it necessary to unmount mounted archives, too, here?
     if (disk_mount_manager_->mount_points().empty())
       return;
@@ skipping 198 matching lines @@
   if (mounted_volumes_.find(volume->volume_id()) == mounted_volumes_.end())
     return;
   if (error_code == chromeos::MOUNT_ERROR_NONE)
     mounted_volumes_.erase(volume->volume_id());
 
   for (auto& observer : observers_)
     observer.OnVolumeUnmounted(error_code, *volume.get());
 }
 
 }  // namespace file_manager