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

Unified Diff: device/media_transfer_protocol/media_transfer_protocol_manager.cc

Issue 628873002: replace OVERRIDE and FINAL with override and final in device/ (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
Index: device/media_transfer_protocol/media_transfer_protocol_manager.cc
diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
index e9239759a8e31f5859ce9e3d9ba275b56bf9aa9e..dc2c5d03ad5b06486fd4da2d18bd8bd2aa0191a1 100644
--- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc
+++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
@@ -92,19 +92,19 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
}
// MediaTransferProtocolManager override.
- virtual void AddObserver(Observer* observer) OVERRIDE {
+ virtual void AddObserver(Observer* observer) override {
DCHECK(thread_checker_.CalledOnValidThread());
observers_.AddObserver(observer);
}
// MediaTransferProtocolManager override.
- virtual void RemoveObserver(Observer* observer) OVERRIDE {
+ virtual void RemoveObserver(Observer* observer) override {
DCHECK(thread_checker_.CalledOnValidThread());
observers_.RemoveObserver(observer);
}
// MediaTransferProtocolManager override.
- virtual const std::vector<std::string> GetStorages() const OVERRIDE {
+ virtual const std::vector<std::string> GetStorages() const override {
DCHECK(thread_checker_.CalledOnValidThread());
std::vector<std::string> storages;
for (StorageInfoMap::const_iterator it = storage_info_map_.begin();
@@ -117,7 +117,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
// MediaTransferProtocolManager override.
virtual const MtpStorageInfo* GetStorageInfo(
- const std::string& storage_name) const OVERRIDE {
+ const std::string& storage_name) const override {
DCHECK(thread_checker_.CalledOnValidThread());
StorageInfoMap::const_iterator it = storage_info_map_.find(storage_name);
return it != storage_info_map_.end() ? &it->second : NULL;
@@ -126,7 +126,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
// MediaTransferProtocolManager override.
virtual void OpenStorage(const std::string& storage_name,
const std::string& mode,
- const OpenStorageCallback& callback) OVERRIDE {
+ const OpenStorageCallback& callback) override {
DCHECK(thread_checker_.CalledOnValidThread());
if (!ContainsKey(storage_info_map_, storage_name) || !mtp_client_) {
callback.Run(std::string(), true);
@@ -144,7 +144,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
// MediaTransferProtocolManager override.
virtual void CloseStorage(const std::string& storage_handle,
- const CloseStorageCallback& callback) OVERRIDE {
+ const CloseStorageCallback& callback) override {
DCHECK(thread_checker_.CalledOnValidThread());
if (!ContainsKey(handles_, storage_handle) || !mtp_client_) {
callback.Run(true);
@@ -162,7 +162,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
// MediaTransferProtocolManager override.
virtual void ReadDirectory(const std::string& storage_handle,
uint32 file_id,
- const ReadDirectoryCallback& callback) OVERRIDE {
+ const ReadDirectoryCallback& callback) override {
DCHECK(thread_checker_.CalledOnValidThread());
if (!ContainsKey(handles_, storage_handle) || !mtp_client_) {
callback.Run(std::vector<MtpFileEntry>(),
@@ -186,7 +186,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
uint32 file_id,
uint32 offset,
uint32 count,
- const ReadFileCallback& callback) OVERRIDE {
+ const ReadFileCallback& callback) override {
DCHECK(thread_checker_.CalledOnValidThread());
if (!ContainsKey(handles_, storage_handle) || !mtp_client_) {
callback.Run(std::string(), true);
@@ -203,7 +203,7 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
virtual void GetFileInfo(const std::string& storage_handle,
uint32 file_id,
- const GetFileInfoCallback& callback) OVERRIDE {
+ const GetFileInfoCallback& callback) override {
DCHECK(thread_checker_.CalledOnValidThread());
if (!ContainsKey(handles_, storage_handle) || !mtp_client_) {
callback.Run(MtpFileEntry(), true);
« no previous file with comments | « device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc ('k') | device/nfc/nfc_adapter_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698