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

Unified Diff: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
index 3e0748b142ce00d56276818123ffcda68a43540a..50131308656a99f5d88080488e2d94d08ac47d69 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
@@ -61,7 +61,7 @@ class LoggingObserver : public VolumeManagerObserver {
// VolumeManagerObserver overrides.
virtual void OnDiskAdded(const chromeos::disks::DiskMountManager::Disk& disk,
- bool mounting) OVERRIDE {
+ bool mounting) override {
Event event;
event.type = Event::DISK_ADDED;
event.device_path = disk.device_path(); // Keep only device_path.
@@ -70,21 +70,21 @@ class LoggingObserver : public VolumeManagerObserver {
}
virtual void OnDiskRemoved(
- const chromeos::disks::DiskMountManager::Disk& disk) OVERRIDE {
+ const chromeos::disks::DiskMountManager::Disk& disk) override {
Event event;
event.type = Event::DISK_REMOVED;
event.device_path = disk.device_path(); // Keep only device_path.
events_.push_back(event);
}
- virtual void OnDeviceAdded(const std::string& device_path) OVERRIDE {
+ virtual void OnDeviceAdded(const std::string& device_path) override {
Event event;
event.type = Event::DEVICE_ADDED;
event.device_path = device_path;
events_.push_back(event);
}
- virtual void OnDeviceRemoved(const std::string& device_path) OVERRIDE {
+ virtual void OnDeviceRemoved(const std::string& device_path) override {
Event event;
event.type = Event::DEVICE_REMOVED;
event.device_path = device_path;
@@ -92,7 +92,7 @@ class LoggingObserver : public VolumeManagerObserver {
}
virtual void OnVolumeMounted(chromeos::MountError error_code,
- const VolumeInfo& volume_info) OVERRIDE {
+ const VolumeInfo& volume_info) override {
Event event;
event.type = Event::VOLUME_MOUNTED;
event.device_path = volume_info.source_path.AsUTF8Unsafe();
@@ -101,7 +101,7 @@ class LoggingObserver : public VolumeManagerObserver {
}
virtual void OnVolumeUnmounted(chromeos::MountError error_code,
- const VolumeInfo& volume_info) OVERRIDE {
+ const VolumeInfo& volume_info) override {
Event event;
event.type = Event::VOLUME_UNMOUNTED;
event.device_path = volume_info.source_path.AsUTF8Unsafe();
@@ -110,7 +110,7 @@ class LoggingObserver : public VolumeManagerObserver {
}
virtual void OnFormatStarted(
- const std::string& device_path, bool success) OVERRIDE {
+ const std::string& device_path, bool success) override {
Event event;
event.type = Event::FORMAT_STARTED;
event.device_path = device_path;
@@ -119,7 +119,7 @@ class LoggingObserver : public VolumeManagerObserver {
}
virtual void OnFormatCompleted(
- const std::string& device_path, bool success) OVERRIDE {
+ const std::string& device_path, bool success) override {
Event event;
event.type = Event::FORMAT_COMPLETED;
event.device_path = device_path;
@@ -170,7 +170,7 @@ class VolumeManagerTest : public testing::Test {
scoped_ptr<VolumeManager> volume_manager_;
};
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
power_manager_client_.reset(new chromeos::FakePowerManagerClient);
disk_mount_manager_.reset(new FakeDiskMountManager);
main_profile_.reset(new ProfileEnvironment(power_manager_client_.get(),
« no previous file with comments | « chrome/browser/chromeos/file_manager/volume_manager_factory.h ('k') | chrome/browser/chromeos/file_manager/zip_file_creator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698