Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1181)

Unified Diff: chrome/browser/chromeos/file_manager/volume_manager.cc

Issue 2668153002: Revert of Move more utility functions to arc_util. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1b7d3a40a925a41124cc994b243289cf72972f04..31626509eb551048f2a91c0e1ac1f719515b2217 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
@@ -17,7 +17,6 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.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"
@@ -408,7 +407,7 @@
// Subscribe to ARC file system events.
if (base::FeatureList::IsEnabled(arc::kMediaViewFeature) &&
- arc::IsArcAllowedForProfile(profile_)) {
+ arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
arc::ArcSessionManager::Get()->AddObserver(this);
OnArcOptInChanged(arc::ArcSessionManager::Get()->IsArcEnabled());
}
@@ -431,7 +430,7 @@
// Unsubscribe from ARC file system events.
if (base::FeatureList::IsEnabled(arc::kMediaViewFeature) &&
- arc::IsArcAllowedForProfile(profile_)) {
+ arc::ArcSessionManager::IsAllowedForProfile(profile_)) {
auto* session_manager = arc::ArcSessionManager::Get();
// TODO(crbug.com/672829): We need nullptr check here because
// ArcSessionManager may or may not be alive at this point.
@@ -745,7 +744,7 @@
void VolumeManager::OnArcOptInChanged(bool enabled) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(base::FeatureList::IsEnabled(arc::kMediaViewFeature));
- DCHECK(arc::IsArcAllowedForProfile(profile_));
+ DCHECK(arc::ArcSessionManager::IsAllowedForProfile(profile_));
if (enabled == arc_volumes_mounted_)
return;
« no previous file with comments | « chrome/browser/chromeos/extensions/info_private_apitest.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698