OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h" | 5 #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/memory/singleton.h" | 9 #include "base/memory/singleton.h" |
10 #include "chrome/browser/chromeos/drive/drive_integration_service.h" | 10 #include "chrome/browser/chromeos/drive/drive_integration_service.h" |
11 #include "chrome/browser/chromeos/file_manager/volume_manager.h" | 11 #include "chrome/browser/chromeos/file_manager/volume_manager.h" |
12 #include "chrome/browser/chromeos/file_system_provider/service_factory.h" | 12 #include "chrome/browser/chromeos/file_system_provider/service_factory.h" |
13 #include "chrome/browser/profiles/incognito_helpers.h" | 13 #include "chrome/browser/profiles/incognito_helpers.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chromeos/dbus/dbus_thread_manager.h" | 15 #include "chromeos/dbus/dbus_thread_manager.h" |
16 #include "chromeos/disks/disk_mount_manager.h" | 16 #include "chromeos/disks/disk_mount_manager.h" |
17 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 17 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
18 #include "components/storage_monitor/storage_monitor.h" | 18 #include "components/storage_monitor/storage_monitor.h" |
19 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h" | 19 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h" |
20 | 20 |
21 namespace file_manager { | 21 namespace file_manager { |
22 | 22 |
23 VolumeManager* VolumeManagerFactory::Get(content::BrowserContext* context) { | 23 VolumeManager* VolumeManagerFactory::Get(content::BrowserContext* context) { |
24 return static_cast<VolumeManager*>( | 24 return static_cast<VolumeManager*>( |
25 GetInstance()->GetServiceForBrowserContext(context, true)); | 25 GetInstance()->GetServiceForBrowserContext(context, true)); |
26 } | 26 } |
27 | 27 |
28 VolumeManagerFactory* VolumeManagerFactory::GetInstance() { | 28 VolumeManagerFactory* VolumeManagerFactory::GetInstance() { |
29 return Singleton<VolumeManagerFactory>::get(); | 29 return base::Singleton<VolumeManagerFactory>::get(); |
30 } | 30 } |
31 | 31 |
32 content::BrowserContext* VolumeManagerFactory::GetBrowserContextToUse( | 32 content::BrowserContext* VolumeManagerFactory::GetBrowserContextToUse( |
33 content::BrowserContext* context) const { | 33 content::BrowserContext* context) const { |
34 // Explicitly allow this manager in guest login mode. | 34 // Explicitly allow this manager in guest login mode. |
35 return chrome::GetBrowserContextOwnInstanceInIncognito(context); | 35 return chrome::GetBrowserContextOwnInstanceInIncognito(context); |
36 } | 36 } |
37 | 37 |
38 bool VolumeManagerFactory::ServiceIsCreatedWithBrowserContext() const { | 38 bool VolumeManagerFactory::ServiceIsCreatedWithBrowserContext() const { |
39 return true; | 39 return true; |
(...skipping 21 matching lines...) Expand all Loading... |
61 "VolumeManagerFactory", | 61 "VolumeManagerFactory", |
62 BrowserContextDependencyManager::GetInstance()) { | 62 BrowserContextDependencyManager::GetInstance()) { |
63 DependsOn(drive::DriveIntegrationServiceFactory::GetInstance()); | 63 DependsOn(drive::DriveIntegrationServiceFactory::GetInstance()); |
64 DependsOn(chromeos::file_system_provider::ServiceFactory::GetInstance()); | 64 DependsOn(chromeos::file_system_provider::ServiceFactory::GetInstance()); |
65 } | 65 } |
66 | 66 |
67 VolumeManagerFactory::~VolumeManagerFactory() { | 67 VolumeManagerFactory::~VolumeManagerFactory() { |
68 } | 68 } |
69 | 69 |
70 } // namespace file_manager | 70 } // namespace file_manager |
OLD | NEW |