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

Side by Side Diff: chrome/browser/chromeos/file_manager/fake_disk_mount_manager.h

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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 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 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FAKE_DISK_MOUNT_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FAKE_DISK_MOUNT_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FAKE_DISK_MOUNT_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FAKE_DISK_MOUNT_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 virtual ~FakeDiskMountManager(); 42 virtual ~FakeDiskMountManager();
43 43
44 const std::vector<MountRequest>& mount_requests() const { 44 const std::vector<MountRequest>& mount_requests() const {
45 return mount_requests_; 45 return mount_requests_;
46 } 46 }
47 const std::vector<UnmountRequest>& unmount_requests() const { 47 const std::vector<UnmountRequest>& unmount_requests() const {
48 return unmount_requests_; 48 return unmount_requests_;
49 } 49 }
50 50
51 // DiskMountManager overrides. 51 // DiskMountManager overrides.
52 virtual void AddObserver(Observer* observer) OVERRIDE; 52 virtual void AddObserver(Observer* observer) override;
53 virtual void RemoveObserver(Observer* observer) OVERRIDE; 53 virtual void RemoveObserver(Observer* observer) override;
54 virtual const DiskMap& disks() const OVERRIDE; 54 virtual const DiskMap& disks() const override;
55 virtual const Disk* FindDiskBySourcePath( 55 virtual const Disk* FindDiskBySourcePath(
56 const std::string& source_path) const OVERRIDE; 56 const std::string& source_path) const override;
57 virtual const MountPointMap& mount_points() const OVERRIDE; 57 virtual const MountPointMap& mount_points() const override;
58 virtual void EnsureMountInfoRefreshed( 58 virtual void EnsureMountInfoRefreshed(
59 const EnsureMountInfoRefreshedCallback& callback) OVERRIDE; 59 const EnsureMountInfoRefreshedCallback& callback) override;
60 virtual void MountPath(const std::string& source_path, 60 virtual void MountPath(const std::string& source_path,
61 const std::string& source_format, 61 const std::string& source_format,
62 const std::string& mount_label, 62 const std::string& mount_label,
63 chromeos::MountType type) OVERRIDE; 63 chromeos::MountType type) override;
64 virtual void UnmountPath(const std::string& mount_path, 64 virtual void UnmountPath(const std::string& mount_path,
65 chromeos::UnmountOptions options, 65 chromeos::UnmountOptions options,
66 const UnmountPathCallback& callback) OVERRIDE; 66 const UnmountPathCallback& callback) override;
67 virtual void FormatMountedDevice(const std::string& mount_path) OVERRIDE; 67 virtual void FormatMountedDevice(const std::string& mount_path) override;
68 virtual void UnmountDeviceRecursively( 68 virtual void UnmountDeviceRecursively(
69 const std::string& device_path, 69 const std::string& device_path,
70 const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE; 70 const UnmountDeviceRecursivelyCallbackType& callback) override;
71 71
72 virtual bool AddDiskForTest(Disk* disk) OVERRIDE; 72 virtual bool AddDiskForTest(Disk* disk) override;
73 virtual bool AddMountPointForTest( 73 virtual bool AddMountPointForTest(
74 const MountPointInfo& mount_point) OVERRIDE; 74 const MountPointInfo& mount_point) override;
75 void InvokeDiskEventForTest(DiskEvent event, const Disk* disk); 75 void InvokeDiskEventForTest(DiskEvent event, const Disk* disk);
76 76
77 private: 77 private:
78 ObserverList<Observer> observers_; 78 ObserverList<Observer> observers_;
79 79
80 DiskMap disks_; 80 DiskMap disks_;
81 MountPointMap mount_points_; 81 MountPointMap mount_points_;
82 82
83 std::vector<MountRequest> mount_requests_; 83 std::vector<MountRequest> mount_requests_;
84 std::vector<UnmountRequest> unmount_requests_; 84 std::vector<UnmountRequest> unmount_requests_;
85 85
86 DISALLOW_COPY_AND_ASSIGN(FakeDiskMountManager); 86 DISALLOW_COPY_AND_ASSIGN(FakeDiskMountManager);
87 }; 87 };
88 88
89 } // namespace file_manager 89 } // namespace file_manager
90 90
91 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FAKE_DISK_MOUNT_MANAGER_H_ 91 #endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_FAKE_DISK_MOUNT_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698