diff options
Diffstat (limited to 'components/storage_monitor')
5 files changed, 27 insertions, 35 deletions
diff --git a/components/storage_monitor/image_capture_device_manager_unittest.mm b/components/storage_monitor/image_capture_device_manager_unittest.mm index 477a203..bd85af9 100644 --- a/components/storage_monitor/image_capture_device_manager_unittest.mm +++ b/components/storage_monitor/image_capture_device_manager_unittest.mm @@ -205,28 +205,24 @@ class TestCameraListener : completed_(false), removed_(false), last_error_(base::File::FILE_ERROR_INVALID_URL) {} - virtual ~TestCameraListener() {} + ~TestCameraListener() override {} - virtual void ItemAdded(const std::string& name, - const base::File::Info& info) override { + void ItemAdded(const std::string& name, + const base::File::Info& info) override { items_.push_back(name); } - virtual void NoMoreItems() override { - completed_ = true; - } + void NoMoreItems() override { completed_ = true; } - virtual void DownloadedFile(const std::string& name, - base::File::Error error) override { + void DownloadedFile(const std::string& name, + base::File::Error error) override { EXPECT_TRUE(content::BrowserThread::CurrentlyOn( content::BrowserThread::UI)); downloads_.push_back(name); last_error_ = error; } - virtual void DeviceRemoved() override { - removed_ = true; - } + void DeviceRemoved() override { removed_ = true; } std::vector<std::string> items() const { return items_; } std::vector<std::string> downloads() const { return downloads_; } diff --git a/components/storage_monitor/mock_removable_storage_observer.h b/components/storage_monitor/mock_removable_storage_observer.h index 220035e..14fde61 100644 --- a/components/storage_monitor/mock_removable_storage_observer.h +++ b/components/storage_monitor/mock_removable_storage_observer.h @@ -13,11 +13,11 @@ namespace storage_monitor { class MockRemovableStorageObserver : public RemovableStorageObserver { public: MockRemovableStorageObserver(); - virtual ~MockRemovableStorageObserver(); + ~MockRemovableStorageObserver() override; - virtual void OnRemovableStorageAttached(const StorageInfo& info) override; + void OnRemovableStorageAttached(const StorageInfo& info) override; - virtual void OnRemovableStorageDetached(const StorageInfo& info) override; + void OnRemovableStorageDetached(const StorageInfo& info) override; int attach_calls() { return attach_calls_; } diff --git a/components/storage_monitor/storage_monitor.cc b/components/storage_monitor/storage_monitor.cc index cd6bfae..f82995d 100644 --- a/components/storage_monitor/storage_monitor.cc +++ b/components/storage_monitor/storage_monitor.cc @@ -25,13 +25,13 @@ class StorageMonitor::ReceiverImpl : public StorageMonitor::Receiver { explicit ReceiverImpl(StorageMonitor* notifications) : notifications_(notifications) {} - virtual ~ReceiverImpl() {} + ~ReceiverImpl() override {} - virtual void ProcessAttach(const StorageInfo& info) override; + void ProcessAttach(const StorageInfo& info) override; - virtual void ProcessDetach(const std::string& id) override; + void ProcessDetach(const std::string& id) override; - virtual void MarkInitialized() override; + void MarkInitialized() override; private: StorageMonitor* notifications_; diff --git a/components/storage_monitor/storage_monitor_mac.h b/components/storage_monitor/storage_monitor_mac.h index 60a76f4..9379f5e 100644 --- a/components/storage_monitor/storage_monitor_mac.h +++ b/components/storage_monitor/storage_monitor_mac.h @@ -30,21 +30,19 @@ class StorageMonitorMac : public StorageMonitor, // Should only be called by browser start up code. Use GetInstance() instead. StorageMonitorMac(); - virtual ~StorageMonitorMac(); + ~StorageMonitorMac() override; - virtual void Init() override; + void Init() override; void UpdateDisk(const std::string& bsd_name, const StorageInfo& info, UpdateType update_type); - virtual bool GetStorageInfoForPath( - const base::FilePath& path, - StorageInfo* device_info) const override; + bool GetStorageInfoForPath(const base::FilePath& path, + StorageInfo* device_info) const override; - virtual void EjectDevice( - const std::string& device_id, - base::Callback<void(EjectStatus)> callback) override; + void EjectDevice(const std::string& device_id, + base::Callback<void(EjectStatus)> callback) override; private: static void DiskAppearedCallback(DADiskRef disk, void* context); diff --git a/components/storage_monitor/test_storage_monitor.h b/components/storage_monitor/test_storage_monitor.h index 202156d..a42949f 100644 --- a/components/storage_monitor/test_storage_monitor.h +++ b/components/storage_monitor/test_storage_monitor.h @@ -14,9 +14,9 @@ namespace storage_monitor { class TestStorageMonitor : public StorageMonitor { public: TestStorageMonitor(); - virtual ~TestStorageMonitor(); + ~TestStorageMonitor() override; - virtual void Init() override; + void Init() override; void MarkInitialized(); @@ -34,9 +34,8 @@ class TestStorageMonitor : public StorageMonitor { // Synchronously initialize the current storage monitor. static void SyncInitialize(); - virtual bool GetStorageInfoForPath( - const base::FilePath& path, - StorageInfo* device_info) const override; + bool GetStorageInfoForPath(const base::FilePath& path, + StorageInfo* device_info) const override; #if defined(OS_WIN) virtual bool GetMTPStorageInfoFromDeviceId( @@ -50,12 +49,11 @@ class TestStorageMonitor : public StorageMonitor { media_transfer_protocol_manager() override; #endif - virtual Receiver* receiver() const override; + Receiver* receiver() const override; - virtual void EjectDevice( + void EjectDevice( const std::string& device_id, - base::Callback<void(StorageMonitor::EjectStatus)> callback) - override; + base::Callback<void(StorageMonitor::EjectStatus)> callback) override; const std::string& ejected_device() const { return ejected_device_; } |