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

Side by Side Diff: components/storage_monitor/storage_monitor_mac.h

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_MAC_H_ 5 #ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_MAC_H_
6 #define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_MAC_H_ 6 #define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_MAC_H_
7 7
8 #include <DiskArbitration/DiskArbitration.h> 8 #include <DiskArbitration/DiskArbitration.h>
9 #include <map> 9 #include <map>
10 10
(...skipping 14 matching lines...) Expand all
25 UPDATE_DEVICE_ADDED, 25 UPDATE_DEVICE_ADDED,
26 UPDATE_DEVICE_CHANGED, 26 UPDATE_DEVICE_CHANGED,
27 UPDATE_DEVICE_REMOVED, 27 UPDATE_DEVICE_REMOVED,
28 }; 28 };
29 29
30 // Should only be called by browser start up code. Use GetInstance() instead. 30 // Should only be called by browser start up code. Use GetInstance() instead.
31 StorageMonitorMac(); 31 StorageMonitorMac();
32 32
33 virtual ~StorageMonitorMac(); 33 virtual ~StorageMonitorMac();
34 34
35 virtual void Init() OVERRIDE; 35 virtual void Init() override;
36 36
37 void UpdateDisk(const std::string& bsd_name, 37 void UpdateDisk(const std::string& bsd_name,
38 const StorageInfo& info, 38 const StorageInfo& info,
39 UpdateType update_type); 39 UpdateType update_type);
40 40
41 virtual bool GetStorageInfoForPath( 41 virtual bool GetStorageInfoForPath(
42 const base::FilePath& path, 42 const base::FilePath& path,
43 StorageInfo* device_info) const OVERRIDE; 43 StorageInfo* device_info) const override;
44 44
45 virtual void EjectDevice( 45 virtual void EjectDevice(
46 const std::string& device_id, 46 const std::string& device_id,
47 base::Callback<void(EjectStatus)> callback) OVERRIDE; 47 base::Callback<void(EjectStatus)> callback) override;
48 48
49 private: 49 private:
50 static void DiskAppearedCallback(DADiskRef disk, void* context); 50 static void DiskAppearedCallback(DADiskRef disk, void* context);
51 static void DiskDisappearedCallback(DADiskRef disk, void* context); 51 static void DiskDisappearedCallback(DADiskRef disk, void* context);
52 static void DiskDescriptionChangedCallback(DADiskRef disk, 52 static void DiskDescriptionChangedCallback(DADiskRef disk,
53 CFArrayRef keys, 53 CFArrayRef keys,
54 void *context); 54 void *context);
55 void GetDiskInfoAndUpdate(DADiskRef disk, UpdateType update_type); 55 void GetDiskInfoAndUpdate(DADiskRef disk, UpdateType update_type);
56 56
57 bool ShouldPostNotificationForDisk(const StorageInfo& info) const; 57 bool ShouldPostNotificationForDisk(const StorageInfo& info) const;
58 bool FindDiskWithMountPoint(const base::FilePath& mount_point, 58 bool FindDiskWithMountPoint(const base::FilePath& mount_point,
59 StorageInfo* info) const; 59 StorageInfo* info) const;
60 60
61 base::ScopedCFTypeRef<DASessionRef> session_; 61 base::ScopedCFTypeRef<DASessionRef> session_;
62 // Maps disk bsd names to disk info objects. This map tracks all mountable 62 // Maps disk bsd names to disk info objects. This map tracks all mountable
63 // devices on the system, though only notifications for removable devices are 63 // devices on the system, though only notifications for removable devices are
64 // posted. 64 // posted.
65 std::map<std::string, StorageInfo> disk_info_map_; 65 std::map<std::string, StorageInfo> disk_info_map_;
66 66
67 int pending_disk_updates_; 67 int pending_disk_updates_;
68 68
69 scoped_ptr<ImageCaptureDeviceManager> image_capture_device_manager_; 69 scoped_ptr<ImageCaptureDeviceManager> image_capture_device_manager_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(StorageMonitorMac); 71 DISALLOW_COPY_AND_ASSIGN(StorageMonitorMac);
72 }; 72 };
73 73
74 } // namespace storage_monitor 74 } // namespace storage_monitor
75 75
76 #endif // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_MAC_H_ 76 #endif // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698