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

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

Issue 23477070: Move OnFileSystemMounted/BeingUnmounted to VolumeManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 248418b6f29f24e23471dfcce3f3dda640907623..2df1005447de55397c2cda7b52093c868c5c8ad7 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc
@@ -6,6 +6,7 @@
#include "base/basictypes.h"
#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/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
@@ -42,6 +43,8 @@ BrowserContextKeyedService* VolumeManagerFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
VolumeManager* instance = new VolumeManager(
Profile::FromBrowserContext(profile),
+ drive::DriveIntegrationServiceFactory::
+ GetForProfileRegardlessOfStates(Profile::FromBrowserContext(profile)),
chromeos::DBusThreadManager::Get()->GetPowerManagerClient(),
chromeos::disks::DiskMountManager::GetInstance());
instance->Initialize();
@@ -52,6 +55,7 @@ VolumeManagerFactory::VolumeManagerFactory()
: BrowserContextKeyedServiceFactory(
"VolumeManagerFactory",
BrowserContextDependencyManager::GetInstance()) {
+ DependsOn(drive::DriveIntegrationServiceFactory::GetInstance());
}
VolumeManagerFactory::~VolumeManagerFactory() {

Powered by Google App Engine
This is Rietveld 408576698