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

Unified Diff: chrome/browser/storage_monitor/storage_monitor_chromeos.h

Issue 14016002: Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix browser_tests Created 7 years, 8 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/storage_monitor/storage_monitor_chromeos.h
===================================================================
--- chrome/browser/storage_monitor/storage_monitor_chromeos.h (revision 194743)
+++ chrome/browser/storage_monitor/storage_monitor_chromeos.h (working copy)
@@ -42,6 +42,9 @@
void Init();
protected:
+ void SetMediaTransferProtocolManagerForTest(
+ device::MediaTransferProtocolManager* test_manager);
+
// disks::DiskMountManager::Observer implementation.
virtual void OnDiskEvent(disks::DiskMountManager::DiskEvent event,
const disks::DiskMountManager::Disk* disk) OVERRIDE;
@@ -62,6 +65,8 @@
virtual void EjectDevice(
const std::string& device_id,
base::Callback<void(EjectStatus)> callback) OVERRIDE;
+ virtual device::MediaTransferProtocolManager*
+ media_transfer_protocol_manager() OVERRIDE;
private:
// Mapping of mount path to removable mass storage info.
@@ -80,6 +85,8 @@
// Mapping of relevant mount points and their corresponding mount devices.
MountMap mount_map_;
+ scoped_ptr<device::MediaTransferProtocolManager>
+ media_transfer_protocol_manager_;
scoped_ptr<chrome::MediaTransferProtocolDeviceObserverLinux>
media_transfer_protocol_device_observer_;
« no previous file with comments | « chrome/browser/storage_monitor/storage_monitor.h ('k') | chrome/browser/storage_monitor/storage_monitor_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698