chrome/browser/chromeos/file_manager/volume_manager_factory.cc - Issue 192573002: [fsp] Introduce file_system_provider::Service class for the FileSystemProvider API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 192573002: [fsp] Introduce file_system_provider::Service class for the FileSystemProvider API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Simplified. Created 6 years, 9 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

« no previous file with comments | « chrome/browser/chromeos/file_manager/volume_manager.cc ('k') | chrome/browser/chromeos/file_manager/volume_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 600084806e4610807dad98952134bf0a3a1cc82c..6428f0fe4f298622dc08a1323b417f5f10d38059 100644

--- a/chrome/browser/chromeos/file_manager/volume_manager_factory.cc

+++ b/chrome/browser/chromeos/file_manager/volume_manager_factory.cc

@@ -8,6 +8,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/service_factory.h"

#include "chrome/browser/profiles/incognito_helpers.h"

#include "chrome/browser/profiles/profile.h"

#include "chromeos/dbus/dbus_thread_manager.h"

@@ -43,10 +44,12 @@ KeyedService* VolumeManagerFactory::BuildServiceInstanceFor(

content::BrowserContext* profile) const {

VolumeManager* instance = new VolumeManager(

Profile::FromBrowserContext(profile),

- drive::DriveIntegrationServiceFactory::

- GetForProfileRegardlessOfStates(Profile::FromBrowserContext(profile)),

+ drive::DriveIntegrationServiceFactory::GetForProfileRegardlessOfStates(

+ Profile::FromBrowserContext(profile)),

chromeos::DBusThreadManager::Get()->GetPowerManagerClient(),

- chromeos::disks::DiskMountManager::GetInstance());

+ chromeos::disks::DiskMountManager::GetInstance(),

+ chromeos::file_system_provider::ServiceFactory::Get(

+ Profile::FromBrowserContext(profile)));

instance->Initialize();

return instance;

}

@@ -56,6 +59,7 @@ VolumeManagerFactory::VolumeManagerFactory()

"VolumeManagerFactory",

BrowserContextDependencyManager::GetInstance()) {

DependsOn(drive::DriveIntegrationServiceFactory::GetInstance());

+ DependsOn(chromeos::file_system_provider::ServiceFactory::GetInstance());

}

VolumeManagerFactory::~VolumeManagerFactory() {