diff options
| author | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-09 10:28:51 +0000 |
|---|---|---|
| committer | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-09 10:28:51 +0000 |
| commit | 473a336d2e4af8fcfa50e5c512ca69e91ac52d7c (patch) | |
| tree | 07edba77c1cab0b57bb5daaabbb18b5a38f29c99 /apps | |
| parent | 3a884d6451cd73e307d8822252e557c0c53c6dd4 (diff) | |
| download | chromium_src-473a336d2e4af8fcfa50e5c512ca69e91ac52d7c.zip chromium_src-473a336d2e4af8fcfa50e5c512ca69e91ac52d7c.tar.gz chromium_src-473a336d2e4af8fcfa50e5c512ca69e91ac52d7c.tar.bz2 | |
Replace direct use of DriveIntegrationServiceFactory with drive::util::GetFileSystemByProfile.
DriveIntegrationServiceFactory::GetForProfile will return the instance
regardless of whether the Drive is enabled or not. GetFileSystemByProfile will
still be looking at enabled state.
BUG=284972
TEST=Ran unit_tests
Review URL: https://chromiumcodereview.appspot.com/23739005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/launcher.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/launcher.cc b/apps/launcher.cc index 6843790..933d37c 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -33,7 +33,6 @@ #include "net/base/net_util.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" @@ -194,14 +193,14 @@ class PlatformAppPathLauncher void GetMimeTypeAndLaunchForDriveFile() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - drive::DriveIntegrationService* service = - drive::DriveIntegrationServiceFactory::FindForProfile(profile_); - if (!service) { + drive::FileSystemInterface* file_system = + drive::util::GetFileSystemByProfile(profile_); + if (!file_system) { LaunchWithNoLaunchData(); return; } - service->file_system()->GetFileByPath( + file_system->GetFileByPath( drive::util::ExtractDrivePath(file_path_), base::Bind(&PlatformAppPathLauncher::OnGotDriveFile, this)); } |