| Index: chrome/browser/chromeos/file_manager/volume_manager.cc
|
| diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| index 392914fab273a9fa107ffdc177e12eff87808256..8c3dbffe47548386de304c233dbf2c68752ae50c 100644
|
| --- a/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| +++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| @@ -17,7 +17,7 @@
|
| #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/arc_util.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"
|
| @@ -409,7 +409,7 @@ void VolumeManager::Initialize() {
|
|
|
| // Subscribe to ARC file system events.
|
| if (base::FeatureList::IsEnabled(arc::kMediaViewFeature) &&
|
| - arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
|
| + arc::util::IsArcAllowedForProfile(profile_)) {
|
| arc::ArcServiceManager::GetGlobalService<arc::ArcFileSystemService>()
|
| ->AddObserver(this);
|
| }
|
| @@ -432,7 +432,7 @@ void VolumeManager::Shutdown() {
|
|
|
| // Unsubscribe from ARC file system events.
|
| if (base::FeatureList::IsEnabled(arc::kMediaViewFeature) &&
|
| - arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
|
| + arc::util::IsArcAllowedForProfile(profile_)) {
|
| arc::ArcFileSystemService* file_system_service =
|
| arc::ArcServiceManager::GetGlobalService<arc::ArcFileSystemService>();
|
| // TODO(crbug.com/672829): We need nullptr check here because
|
| @@ -747,7 +747,7 @@ void VolumeManager::OnExternalStorageDisabledChangedUnmountCallback(
|
| void VolumeManager::OnFileSystemsReady() {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| DCHECK(base::FeatureList::IsEnabled(arc::kMediaViewFeature));
|
| - DCHECK(arc::ArcSessionManager::IsAllowedForProfile(profile_));
|
| + DCHECK(arc::util::IsArcAllowedForProfile(profile_));
|
|
|
| DoMountEvent(chromeos::MOUNT_ERROR_NONE,
|
| linked_ptr<Volume>(
|
| @@ -763,7 +763,7 @@ void VolumeManager::OnFileSystemsReady() {
|
| void VolumeManager::OnFileSystemsClosed() {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| DCHECK(base::FeatureList::IsEnabled(arc::kMediaViewFeature));
|
| - DCHECK(arc::ArcSessionManager::IsAllowedForProfile(profile_));
|
| + DCHECK(arc::util::IsArcAllowedForProfile(profile_));
|
|
|
| DoUnmountEvent(chromeos::MOUNT_ERROR_NONE,
|
| linked_ptr<Volume>(
|
|
|