diff options
author | mostynb <mostynb@opera.com> | 2014-10-06 11:58:54 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-06 18:59:32 +0000 |
commit | 53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b (patch) | |
tree | 8d5842cd29ae43752b5f4ebc8d190e5a73282186 /device/usb | |
parent | dafebe67bfde1d352b552016db93d089d6693799 (diff) | |
download | chromium_src-53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b.zip chromium_src-53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b.tar.gz chromium_src-53cd3c4dcc32e26f5bf3fb0a1e9cf27bd47b9d6b.tar.bz2 |
replace OVERRIDE and FINAL with override and final in device/
BUG=417463
Review URL: https://codereview.chromium.org/628873002
Cr-Commit-Position: refs/heads/master@{#298289}
Diffstat (limited to 'device/usb')
-rw-r--r-- | device/usb/usb_context.cc | 2 | ||||
-rw-r--r-- | device/usb/usb_device_filter_unittest.cc | 2 | ||||
-rw-r--r-- | device/usb/usb_device_handle_impl.h | 22 | ||||
-rw-r--r-- | device/usb/usb_device_impl.h | 14 | ||||
-rw-r--r-- | device/usb/usb_service_impl.cc | 6 |
5 files changed, 23 insertions, 23 deletions
diff --git a/device/usb/usb_context.cc b/device/usb/usb_context.cc index 72a3835..dac86fe 100644 --- a/device/usb/usb_context.cc +++ b/device/usb/usb_context.cc @@ -23,7 +23,7 @@ class UsbContext::UsbEventHandler : public base::PlatformThread::Delegate { virtual ~UsbEventHandler(); // base::PlatformThread::Delegate - virtual void ThreadMain() OVERRIDE; + virtual void ThreadMain() override; private: base::subtle::Atomic32 running_; diff --git a/device/usb/usb_device_filter_unittest.cc b/device/usb/usb_device_filter_unittest.cc index 595519a..5529db1 100644 --- a/device/usb/usb_device_filter_unittest.cc +++ b/device/usb/usb_device_filter_unittest.cc @@ -40,7 +40,7 @@ class MockUsbDevice : public UsbDevice { class UsbFilterTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { UsbInterfaceDescriptor interface; interface.interface_number = 1; interface.alternate_setting = 0; diff --git a/device/usb/usb_device_handle_impl.h b/device/usb/usb_device_handle_impl.h index effb9ba..b92f779 100644 --- a/device/usb/usb_device_handle_impl.h +++ b/device/usb/usb_device_handle_impl.h @@ -33,15 +33,15 @@ typedef libusb_transfer* PlatformUsbTransferHandle; // UsbDeviceHandle class provides basic I/O related functionalities. class UsbDeviceHandleImpl : public UsbDeviceHandle { public: - virtual scoped_refptr<UsbDevice> GetDevice() const OVERRIDE; - virtual void Close() OVERRIDE; - virtual bool ClaimInterface(int interface_number) OVERRIDE; - virtual bool ReleaseInterface(int interface_number) OVERRIDE; + virtual scoped_refptr<UsbDevice> GetDevice() const override; + virtual void Close() override; + virtual bool ClaimInterface(int interface_number) override; + virtual bool ReleaseInterface(int interface_number) override; virtual bool SetInterfaceAlternateSetting(int interface_number, - int alternate_setting) OVERRIDE; - virtual bool ResetDevice() OVERRIDE; + int alternate_setting) override; + virtual bool ResetDevice() override; virtual bool GetStringDescriptor(uint8 string_id, - base::string16* string) OVERRIDE; + base::string16* string) override; virtual void ControlTransfer(UsbEndpointDirection direction, TransferRequestType request_type, @@ -52,21 +52,21 @@ class UsbDeviceHandleImpl : public UsbDeviceHandle { net::IOBuffer* buffer, size_t length, unsigned int timeout, - const UsbTransferCallback& callback) OVERRIDE; + const UsbTransferCallback& callback) override; virtual void BulkTransfer(UsbEndpointDirection direction, uint8 endpoint, net::IOBuffer* buffer, size_t length, unsigned int timeout, - const UsbTransferCallback& callback) OVERRIDE; + const UsbTransferCallback& callback) override; virtual void InterruptTransfer(UsbEndpointDirection direction, uint8 endpoint, net::IOBuffer* buffer, size_t length, unsigned int timeout, - const UsbTransferCallback& callback) OVERRIDE; + const UsbTransferCallback& callback) override; virtual void IsochronousTransfer( UsbEndpointDirection direction, @@ -76,7 +76,7 @@ class UsbDeviceHandleImpl : public UsbDeviceHandle { unsigned int packets, unsigned int packet_length, unsigned int timeout, - const UsbTransferCallback& callback) OVERRIDE; + const UsbTransferCallback& callback) override; PlatformUsbDeviceHandle handle() const { return handle_; } diff --git a/device/usb/usb_device_impl.h b/device/usb/usb_device_impl.h index 5f5228b..9a14947 100644 --- a/device/usb/usb_device_impl.h +++ b/device/usb/usb_device_impl.h @@ -34,14 +34,14 @@ class UsbDeviceImpl : public UsbDevice { #if defined(OS_CHROMEOS) virtual void RequestUsbAccess( int interface_id, - const base::Callback<void(bool success)>& callback) OVERRIDE; + const base::Callback<void(bool success)>& callback) override; #endif // OS_CHROMEOS - virtual scoped_refptr<UsbDeviceHandle> Open() OVERRIDE; - virtual bool Close(scoped_refptr<UsbDeviceHandle> handle) OVERRIDE; - virtual const UsbConfigDescriptor& GetConfiguration() OVERRIDE; - virtual bool GetManufacturer(base::string16* manufacturer) OVERRIDE; - virtual bool GetProduct(base::string16* product) OVERRIDE; - virtual bool GetSerialNumber(base::string16* serial_number) OVERRIDE; + virtual scoped_refptr<UsbDeviceHandle> Open() override; + virtual bool Close(scoped_refptr<UsbDeviceHandle> handle) override; + virtual const UsbConfigDescriptor& GetConfiguration() override; + virtual bool GetManufacturer(base::string16* manufacturer) override; + virtual bool GetProduct(base::string16* product) override; + virtual bool GetSerialNumber(base::string16* serial_number) override; protected: friend class UsbServiceImpl; diff --git a/device/usb/usb_service_impl.cc b/device/usb/usb_service_impl.cc index 5e65608..e639870 100644 --- a/device/usb/usb_service_impl.cc +++ b/device/usb/usb_service_impl.cc @@ -38,12 +38,12 @@ class UsbServiceImpl : public UsbService, private: // device::UsbService implementation - virtual scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id) OVERRIDE; + virtual scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id) override; virtual void GetDevices( - std::vector<scoped_refptr<UsbDevice> >* devices) OVERRIDE; + std::vector<scoped_refptr<UsbDevice> >* devices) override; // base::MessageLoop::DestructionObserver implementation. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; // Enumerate USB devices from OS and update devices_ map. void RefreshDevices(); |