diff --git a/content/browser/device_sensors/data_fetcher_shared_memory.h b/content/browser/device_sensors/data_fetcher_shared_memory.h index bd5c8c425d84..4715cbbcdb14 100644 --- a/content/browser/device_sensors/data_fetcher_shared_memory.h +++ b/content/browser/device_sensors/data_fetcher_shared_memory.h @@ -30,8 +30,8 @@ class CONTENT_EXPORT DataFetcherSharedMemory virtual ~DataFetcherSharedMemory(); private: - virtual bool Start(ConsumerType consumer_type, void* buffer) OVERRIDE; - virtual bool Stop(ConsumerType consumer_type) OVERRIDE; + virtual bool Start(ConsumerType consumer_type, void* buffer) override; + virtual bool Stop(ConsumerType consumer_type) override; #if !defined(OS_ANDROID) DeviceMotionHardwareBuffer* motion_buffer_; @@ -39,8 +39,8 @@ class CONTENT_EXPORT DataFetcherSharedMemory DeviceLightHardwareBuffer* light_buffer_; #endif #if defined(OS_MACOSX) - virtual void Fetch(unsigned consumer_bitmask) OVERRIDE; - virtual FetcherType GetType() const OVERRIDE; + virtual void Fetch(unsigned consumer_bitmask) override; + virtual FetcherType GetType() const override; scoped_ptr sudden_motion_sensor_; #elif defined(OS_WIN) @@ -48,7 +48,7 @@ class CONTENT_EXPORT DataFetcherSharedMemory class SensorEventSinkMotion; class SensorEventSinkOrientation; - virtual FetcherType GetType() const OVERRIDE; + virtual FetcherType GetType() const override; bool RegisterForSensor(REFSENSOR_TYPE_ID sensor_type, ISensor** sensor, scoped_refptr event_sink); diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc b/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc index 18f419fb26be..10586abedd39 100644 --- a/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc +++ b/content/browser/device_sensors/data_fetcher_shared_memory_base_unittest.cc @@ -157,7 +157,7 @@ class FakeNonPollingDataFetcher : public FakeDataFetcher { FakeNonPollingDataFetcher() { } virtual ~FakeNonPollingDataFetcher() { } - virtual bool Start(ConsumerType consumer_type, void* buffer) OVERRIDE { + virtual bool Start(ConsumerType consumer_type, void* buffer) override { Init(consumer_type, buffer); switch (consumer_type) { case CONSUMER_TYPE_MOTION: @@ -178,7 +178,7 @@ class FakeNonPollingDataFetcher : public FakeDataFetcher { return true; } - virtual bool Stop(ConsumerType consumer_type) OVERRIDE { + virtual bool Stop(ConsumerType consumer_type) override { switch (consumer_type) { case CONSUMER_TYPE_MOTION: stop_motion_.Signal(); @@ -195,12 +195,12 @@ class FakeNonPollingDataFetcher : public FakeDataFetcher { return true; } - virtual void Fetch(unsigned consumer_bitmask) OVERRIDE { + virtual void Fetch(unsigned consumer_bitmask) override { FAIL() << "fetch should not be called, " << "because this is a non-polling fetcher"; } - virtual FetcherType GetType() const OVERRIDE { + virtual FetcherType GetType() const override { return FakeDataFetcher::GetType(); } @@ -213,7 +213,7 @@ class FakePollingDataFetcher : public FakeDataFetcher { FakePollingDataFetcher() { } virtual ~FakePollingDataFetcher() { } - virtual bool Start(ConsumerType consumer_type, void* buffer) OVERRIDE { + virtual bool Start(ConsumerType consumer_type, void* buffer) override { EXPECT_TRUE(base::MessageLoop::current() == GetPollingMessageLoop()); Init(consumer_type, buffer); @@ -233,7 +233,7 @@ class FakePollingDataFetcher : public FakeDataFetcher { return true; } - virtual bool Stop(ConsumerType consumer_type) OVERRIDE { + virtual bool Stop(ConsumerType consumer_type) override { EXPECT_TRUE(base::MessageLoop::current() == GetPollingMessageLoop()); switch (consumer_type) { @@ -252,7 +252,7 @@ class FakePollingDataFetcher : public FakeDataFetcher { return true; } - virtual void Fetch(unsigned consumer_bitmask) OVERRIDE { + virtual void Fetch(unsigned consumer_bitmask) override { EXPECT_TRUE(base::MessageLoop::current() == GetPollingMessageLoop()); EXPECT_TRUE(consumer_bitmask & CONSUMER_TYPE_ORIENTATION || consumer_bitmask & CONSUMER_TYPE_MOTION || @@ -266,7 +266,7 @@ class FakePollingDataFetcher : public FakeDataFetcher { UpdateLight(); } - virtual FetcherType GetType() const OVERRIDE { + virtual FetcherType GetType() const override { return FETCHER_TYPE_POLLING_CALLBACK; } @@ -279,7 +279,7 @@ class FakeZeroDelayPollingDataFetcher : public FakeDataFetcher { FakeZeroDelayPollingDataFetcher() { } virtual ~FakeZeroDelayPollingDataFetcher() { } - virtual bool Start(ConsumerType consumer_type, void* buffer) OVERRIDE { + virtual bool Start(ConsumerType consumer_type, void* buffer) override { EXPECT_TRUE(base::MessageLoop::current() == GetPollingMessageLoop()); Init(consumer_type, buffer); @@ -299,7 +299,7 @@ class FakeZeroDelayPollingDataFetcher : public FakeDataFetcher { return true; } - virtual bool Stop(ConsumerType consumer_type) OVERRIDE { + virtual bool Stop(ConsumerType consumer_type) override { EXPECT_TRUE(base::MessageLoop::current() == GetPollingMessageLoop()); switch (consumer_type) { @@ -318,11 +318,11 @@ class FakeZeroDelayPollingDataFetcher : public FakeDataFetcher { return true; } - virtual void Fetch(unsigned consumer_bitmask) OVERRIDE { + virtual void Fetch(unsigned consumer_bitmask) override { FAIL() << "fetch should not be called"; } - virtual FetcherType GetType() const OVERRIDE { + virtual FetcherType GetType() const override { return FETCHER_TYPE_SEPARATE_THREAD; } diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_win.cc b/content/browser/device_sensors/data_fetcher_shared_memory_win.cc index 96f4a14215e1..c537e0325518 100644 --- a/content/browser/device_sensors/data_fetcher_shared_memory_win.cc +++ b/content/browser/device_sensors/data_fetcher_shared_memory_win.cc @@ -30,15 +30,15 @@ class DataFetcherSharedMemory::SensorEventSink virtual ~SensorEventSink() {} // IUnknown interface - virtual ULONG STDMETHODCALLTYPE AddRef() OVERRIDE { + virtual ULONG STDMETHODCALLTYPE AddRef() override { return IUnknownImpl::AddRef(); } - virtual ULONG STDMETHODCALLTYPE Release() OVERRIDE { + virtual ULONG STDMETHODCALLTYPE Release() override { return IUnknownImpl::Release(); } - virtual STDMETHODIMP QueryInterface(REFIID riid, void** ppv) OVERRIDE { + virtual STDMETHODIMP QueryInterface(REFIID riid, void** ppv) override { if (riid == __uuidof(ISensorEvents)) { *ppv = static_cast(this); AddRef(); @@ -50,20 +50,20 @@ class DataFetcherSharedMemory::SensorEventSink // ISensorEvents interface STDMETHODIMP OnEvent(ISensor* sensor, REFGUID event_id, - IPortableDeviceValues* event_data) OVERRIDE { + IPortableDeviceValues* event_data) override { return S_OK; } - STDMETHODIMP OnLeave(REFSENSOR_ID sensor_id) OVERRIDE { + STDMETHODIMP OnLeave(REFSENSOR_ID sensor_id) override { return S_OK; } - STDMETHODIMP OnStateChanged(ISensor* sensor, SensorState state) OVERRIDE { + STDMETHODIMP OnStateChanged(ISensor* sensor, SensorState state) override { return S_OK; } STDMETHODIMP OnDataUpdated(ISensor* sensor, - ISensorDataReport* new_data) OVERRIDE { + ISensorDataReport* new_data) override { if (NULL == new_data || NULL == sensor) return E_INVALIDARG; return UpdateSharedMemoryBuffer(sensor, new_data) ? S_OK : E_FAIL; @@ -102,7 +102,7 @@ class DataFetcherSharedMemory::SensorEventSinkOrientation protected: virtual bool UpdateSharedMemoryBuffer( - ISensor* sensor, ISensorDataReport* new_data) OVERRIDE { + ISensor* sensor, ISensorDataReport* new_data) override { double alpha, beta, gamma; bool has_alpha, has_beta, has_gamma; @@ -145,7 +145,7 @@ class DataFetcherSharedMemory::SensorEventSinkMotion protected: virtual bool UpdateSharedMemoryBuffer( - ISensor* sensor, ISensorDataReport* new_data) OVERRIDE { + ISensor* sensor, ISensorDataReport* new_data) override { SENSOR_TYPE_ID sensor_type = GUID_NULL; if (!SUCCEEDED(sensor->GetType(&sensor_type))) diff --git a/content/browser/device_sensors/device_inertial_sensor_browsertest.cc b/content/browser/device_sensors/device_inertial_sensor_browsertest.cc index 4fc83c2583c2..6ef388b7b18c 100644 --- a/content/browser/device_sensors/device_inertial_sensor_browsertest.cc +++ b/content/browser/device_sensors/device_inertial_sensor_browsertest.cc @@ -36,7 +36,7 @@ class FakeDataFetcher : public DataFetcherSharedMemory { sensor_data_available_(true) {} virtual ~FakeDataFetcher() { } - virtual bool Start(ConsumerType consumer_type, void* buffer) OVERRIDE { + virtual bool Start(ConsumerType consumer_type, void* buffer) override { EXPECT_TRUE(buffer); switch (consumer_type) { @@ -77,7 +77,7 @@ class FakeDataFetcher : public DataFetcherSharedMemory { return true; } - virtual bool Stop(ConsumerType consumer_type) OVERRIDE { + virtual bool Stop(ConsumerType consumer_type) override { switch (consumer_type) { case CONSUMER_TYPE_MOTION: stopped_motion_.Signal(); @@ -94,11 +94,11 @@ class FakeDataFetcher : public DataFetcherSharedMemory { return true; } - virtual void Fetch(unsigned consumer_bitmask) OVERRIDE { + virtual void Fetch(unsigned consumer_bitmask) override { FAIL() << "fetch should not be called"; } - virtual FetcherType GetType() const OVERRIDE { + virtual FetcherType GetType() const override { return FETCHER_TYPE_DEFAULT; } @@ -184,7 +184,7 @@ class DeviceInertialSensorBrowserTest : public ContentBrowserTest { io_loop_finished_event_(false, false) { } - virtual void SetUpOnMainThread() OVERRIDE { + virtual void SetUpOnMainThread() override { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind(&DeviceInertialSensorBrowserTest::SetUpOnIOThread, this)); diff --git a/content/browser/device_sensors/device_light_message_filter.h b/content/browser/device_sensors/device_light_message_filter.h index 27661593768a..0635f6e18e47 100644 --- a/content/browser/device_sensors/device_light_message_filter.h +++ b/content/browser/device_sensors/device_light_message_filter.h @@ -14,7 +14,7 @@ class DeviceLightMessageFilter : public BrowserMessageFilter { DeviceLightMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~DeviceLightMessageFilter(); diff --git a/content/browser/device_sensors/device_motion_message_filter.h b/content/browser/device_sensors/device_motion_message_filter.h index cd4859472d57..4e16e5cfaeb6 100644 --- a/content/browser/device_sensors/device_motion_message_filter.h +++ b/content/browser/device_sensors/device_motion_message_filter.h @@ -14,7 +14,7 @@ class DeviceMotionMessageFilter : public BrowserMessageFilter { DeviceMotionMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~DeviceMotionMessageFilter(); diff --git a/content/browser/device_sensors/device_orientation_message_filter.h b/content/browser/device_sensors/device_orientation_message_filter.h index 56893c83a163..73d7f426c6a5 100644 --- a/content/browser/device_sensors/device_orientation_message_filter.h +++ b/content/browser/device_sensors/device_orientation_message_filter.h @@ -14,7 +14,7 @@ class DeviceOrientationMessageFilter : public BrowserMessageFilter { DeviceOrientationMessageFilter(); // BrowserMessageFilter implementation. - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; + virtual bool OnMessageReceived(const IPC::Message& message) override; private: virtual ~DeviceOrientationMessageFilter(); diff --git a/content/browser/device_sensors/sensor_manager_android_unittest.cc b/content/browser/device_sensors/sensor_manager_android_unittest.cc index 096f3ecc4ae3..b5f0c5fb9335 100644 --- a/content/browser/device_sensors/sensor_manager_android_unittest.cc +++ b/content/browser/device_sensors/sensor_manager_android_unittest.cc @@ -19,7 +19,7 @@ class FakeSensorManagerAndroid : public SensorManagerAndroid { FakeSensorManagerAndroid() { } virtual ~FakeSensorManagerAndroid() { } - virtual int GetNumberActiveDeviceMotionSensors() OVERRIDE { + virtual int GetNumberActiveDeviceMotionSensors() override { return number_active_sensors_; } @@ -28,11 +28,11 @@ class FakeSensorManagerAndroid : public SensorManagerAndroid { } protected: - virtual bool Start(EventType event_type) OVERRIDE { + virtual bool Start(EventType event_type) override { return true; } - virtual void Stop(EventType event_type) OVERRIDE { + virtual void Stop(EventType event_type) override { } private: