| Index: chrome/browser/storage_monitor/storage_monitor_linux.h
|
| diff --git a/chrome/browser/storage_monitor/removable_device_notifications_linux.h b/chrome/browser/storage_monitor/storage_monitor_linux.h
|
| similarity index 90%
|
| rename from chrome/browser/storage_monitor/removable_device_notifications_linux.h
|
| rename to chrome/browser/storage_monitor/storage_monitor_linux.h
|
| index 2c4a75612fa9bc50c4194ae5c9448eaf2efb8b16..9e45ff6f298243b2e52f0a42e9f20cac8951c46e 100644
|
| --- a/chrome/browser/storage_monitor/removable_device_notifications_linux.h
|
| +++ b/chrome/browser/storage_monitor/storage_monitor_linux.h
|
| @@ -39,13 +39,13 @@ typedef void (*GetDeviceInfoFunc)(const base::FilePath& device_path,
|
|
|
| namespace chrome {
|
|
|
| -class RemovableDeviceNotificationsLinux
|
| +class StorageMonitorLinux
|
| : public StorageMonitor,
|
| - public base::RefCountedThreadSafe<RemovableDeviceNotificationsLinux,
|
| + public base::RefCountedThreadSafe<StorageMonitorLinux,
|
| content::BrowserThread::DeleteOnFileThread> {
|
| public:
|
| // Should only be called by browser start up code. Use GetInstance() instead.
|
| - explicit RemovableDeviceNotificationsLinux(const base::FilePath& path);
|
| + explicit StorageMonitorLinux(const base::FilePath& path);
|
|
|
| // Must be called for RemovableDeviceNotificationsLinux to work.
|
| void Init();
|
| @@ -62,20 +62,20 @@ class RemovableDeviceNotificationsLinux
|
|
|
| protected:
|
| // Only for use in unit tests.
|
| - RemovableDeviceNotificationsLinux(const base::FilePath& path,
|
| + StorageMonitorLinux(const base::FilePath& path,
|
| GetDeviceInfoFunc getDeviceInfo);
|
|
|
| // Avoids code deleting the object while there are references to it.
|
| // Aside from the base::RefCountedThreadSafe friend class, and derived
|
| // classes, any attempts to call this dtor will result in a compile-time
|
| // error.
|
| - virtual ~RemovableDeviceNotificationsLinux();
|
| + virtual ~StorageMonitorLinux();
|
|
|
| virtual void OnFilePathChanged(const base::FilePath& path, bool error);
|
|
|
| private:
|
| - friend class base::RefCountedThreadSafe<RemovableDeviceNotificationsLinux>;
|
| - friend class base::DeleteHelper<RemovableDeviceNotificationsLinux>;
|
| + friend class base::RefCountedThreadSafe<StorageMonitorLinux>;
|
| + friend class base::DeleteHelper<StorageMonitorLinux>;
|
| friend struct content::BrowserThread::DeleteOnThread<
|
| content::BrowserThread::FILE>;
|
|
|
| @@ -141,7 +141,7 @@ class RemovableDeviceNotificationsLinux
|
| // points.
|
| MountPriorityMap mount_priority_map_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsLinux);
|
| + DISALLOW_COPY_AND_ASSIGN(StorageMonitorLinux);
|
| };
|
|
|
| } // namespace chrome
|
|
|