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

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

Issue 1093383002: [WIP] Provided file system from NACL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved several modules to chromeos folder. Created 5 years, 5 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_factory.cc
diff --git a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc
index 4b64ecbad5a0c21a86db5c3e755840776b23ef9e..09c461a857fe8751795dbb6cd97c2a16d2944737 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc
@@ -9,6 +9,7 @@
#include "base/memory/singleton.h"
#include "chrome/browser/chromeos/drive/drive_integration_service.h"
#include "chrome/browser/chromeos/file_manager/volume_manager.h"
+#include "chrome/browser/chromeos/file_system_provider/file_system_plugin/plugin_service_factory.h"
#include "chrome/browser/chromeos/file_system_provider/service_factory.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
@@ -51,6 +52,7 @@ KeyedService* VolumeManagerFactory::BuildServiceInstanceFor(
chromeos::DBusThreadManager::Get()->GetPowerManagerClient(),
chromeos::disks::DiskMountManager::GetInstance(),
chromeos::file_system_provider::ServiceFactory::Get(context),
+ chromeos::file_system_provider::PluginServiceFactory::Get(context),
VolumeManager::GetMtpStorageInfoCallback());
instance->Initialize();
return instance;
@@ -62,6 +64,8 @@ VolumeManagerFactory::VolumeManagerFactory()
BrowserContextDependencyManager::GetInstance()) {
DependsOn(drive::DriveIntegrationServiceFactory::GetInstance());
DependsOn(chromeos::file_system_provider::ServiceFactory::GetInstance());
+ DependsOn(
+ chromeos::file_system_provider::PluginServiceFactory::GetInstance());
}
VolumeManagerFactory::~VolumeManagerFactory() {

Powered by Google App Engine
This is Rietveld 408576698