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

Unified Diff: chromeos/disks/disk_mount_manager.cc

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/update_engine_client.cc ('k') | chromeos/ime/fake_ime_keyboard.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/disks/disk_mount_manager.cc
diff --git a/chromeos/disks/disk_mount_manager.cc b/chromeos/disks/disk_mount_manager.cc
index 291263a47ced3e05a609a96fb37ba92d32320fd0..4867d51ee27d5051043808d5bf30e82873cd6064 100644
--- a/chromeos/disks/disk_mount_manager.cc
+++ b/chromeos/disks/disk_mount_manager.cc
@@ -49,12 +49,12 @@ class DiskMountManagerImpl : public DiskMountManager {
}
// DiskMountManager override.
- virtual void AddObserver(Observer* observer) OVERRIDE {
+ virtual void AddObserver(Observer* observer) override {
observers_.AddObserver(observer);
}
// DiskMountManager override.
- virtual void RemoveObserver(Observer* observer) OVERRIDE {
+ virtual void RemoveObserver(Observer* observer) override {
observers_.RemoveObserver(observer);
}
@@ -62,7 +62,7 @@ class DiskMountManagerImpl : public DiskMountManager {
virtual void MountPath(const std::string& source_path,
const std::string& source_format,
const std::string& mount_label,
- MountType type) OVERRIDE {
+ MountType type) override {
// Hidden and non-existent devices should not be mounted.
if (type == MOUNT_TYPE_DEVICE) {
DiskMap::const_iterator it = disks_.find(source_path);
@@ -87,7 +87,7 @@ class DiskMountManagerImpl : public DiskMountManager {
// DiskMountManager override.
virtual void UnmountPath(const std::string& mount_path,
UnmountOptions options,
- const UnmountPathCallback& callback) OVERRIDE {
+ const UnmountPathCallback& callback) override {
UnmountChildMounts(mount_path);
cros_disks_client_->Unmount(mount_path, options,
base::Bind(&DiskMountManagerImpl::OnUnmountPath,
@@ -103,7 +103,7 @@ class DiskMountManagerImpl : public DiskMountManager {
}
// DiskMountManager override.
- virtual void FormatMountedDevice(const std::string& mount_path) OVERRIDE {
+ virtual void FormatMountedDevice(const std::string& mount_path) override {
MountPointMap::const_iterator mount_point = mount_points_.find(mount_path);
if (mount_point == mount_points_.end()) {
LOG(ERROR) << "Mount point with path \"" << mount_path << "\" not found.";
@@ -129,7 +129,7 @@ class DiskMountManagerImpl : public DiskMountManager {
// DiskMountManager override.
virtual void UnmountDeviceRecursively(
const std::string& device_path,
- const UnmountDeviceRecursivelyCallbackType& callback) OVERRIDE {
+ const UnmountDeviceRecursivelyCallbackType& callback) override {
std::vector<std::string> devices_to_unmount;
// Get list of all devices to unmount.
@@ -192,7 +192,7 @@ class DiskMountManagerImpl : public DiskMountManager {
// DiskMountManager override.
virtual void EnsureMountInfoRefreshed(
- const EnsureMountInfoRefreshedCallback& callback) OVERRIDE {
+ const EnsureMountInfoRefreshedCallback& callback) override {
if (already_refreshed_) {
callback.Run(true);
return;
@@ -210,22 +210,22 @@ class DiskMountManagerImpl : public DiskMountManager {
}
// DiskMountManager override.
- virtual const DiskMap& disks() const OVERRIDE { return disks_; }
+ virtual const DiskMap& disks() const override { return disks_; }
// DiskMountManager override.
virtual const Disk* FindDiskBySourcePath(const std::string& source_path)
- const OVERRIDE {
+ const override {
DiskMap::const_iterator disk_it = disks_.find(source_path);
return disk_it == disks_.end() ? NULL : disk_it->second;
}
// DiskMountManager override.
- virtual const MountPointMap& mount_points() const OVERRIDE {
+ virtual const MountPointMap& mount_points() const override {
return mount_points_;
}
// DiskMountManager override.
- virtual bool AddDiskForTest(Disk* disk) OVERRIDE {
+ virtual bool AddDiskForTest(Disk* disk) override {
if (disks_.find(disk->device_path()) != disks_.end()) {
LOG(ERROR) << "Attempt to add a duplicate disk";
return false;
@@ -238,7 +238,7 @@ class DiskMountManagerImpl : public DiskMountManager {
// DiskMountManager override.
// Corresponding disk should be added to the manager before this is called.
virtual bool AddMountPointForTest(
- const MountPointInfo& mount_point) OVERRIDE {
+ const MountPointInfo& mount_point) override {
if (mount_points_.find(mount_point.mount_path) != mount_points_.end()) {
LOG(ERROR) << "Attempt to add a duplicate mount point";
return false;
« no previous file with comments | « chromeos/dbus/update_engine_client.cc ('k') | chromeos/ime/fake_ime_keyboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698