diff options
author | timvolodine <timvolodine@chromium.org> | 2015-03-12 09:21:21 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-12 16:22:15 +0000 |
commit | 9e05ab78ffd3331452478ce0d5e2d6edbb6fe265 (patch) | |
tree | d28987cb74ae04e4376be95678f7765b0ff01dd8 /content | |
parent | 0f92988f0ef745e9ea4b2ff68c897cb83d911469 (diff) | |
download | chromium_src-9e05ab78ffd3331452478ce0d5e2d6edbb6fe265.zip chromium_src-9e05ab78ffd3331452478ce0d5e2d6edbb6fe265.tar.gz chromium_src-9e05ab78ffd3331452478ce0d5e2d6edbb6fe265.tar.bz2 |
Clean-up unnecessary virtuals and statics in browser/device_sensors/
Some clean-up of unneccessary bits in the browser/device_sensors directory.
BUG=
Review URL: https://codereview.chromium.org/994603003
Cr-Commit-Position: refs/heads/master@{#320297}
Diffstat (limited to 'content')
5 files changed, 13 insertions, 13 deletions
diff --git a/content/browser/device_sensors/data_fetcher_shared_memory.h b/content/browser/device_sensors/data_fetcher_shared_memory.h index f17eb27..ea56b00 100644 --- a/content/browser/device_sensors/data_fetcher_shared_memory.h +++ b/content/browser/device_sensors/data_fetcher_shared_memory.h @@ -63,7 +63,7 @@ class CONTENT_EXPORT DataFetcherSharedMemory class SensorEventSinkOrientation; class SensorEventSinkLight; - virtual FetcherType GetType() const override; + FetcherType GetType() const override; bool RegisterForSensor(REFSENSOR_TYPE_ID sensor_type, ISensor** sensor, scoped_refptr<SensorEventSink> event_sink); diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc b/content/browser/device_sensors/data_fetcher_shared_memory_base.cc index 0b9a178..f2b2d40 100644 --- a/content/browser/device_sensors/data_fetcher_shared_memory_base.cc +++ b/content/browser/device_sensors/data_fetcher_shared_memory_base.cc @@ -17,7 +17,7 @@ namespace content { namespace { -static size_t GetConsumerSharedMemoryBufferSize(ConsumerType consumer_type) { +size_t GetConsumerSharedMemoryBufferSize(ConsumerType consumer_type) { switch (consumer_type) { case CONSUMER_TYPE_MOTION: return sizeof(DeviceMotionHardwareBuffer); diff --git a/content/browser/device_sensors/data_fetcher_shared_memory_default.cc b/content/browser/device_sensors/data_fetcher_shared_memory_default.cc index e97993f..9b3a60b 100644 --- a/content/browser/device_sensors/data_fetcher_shared_memory_default.cc +++ b/content/browser/device_sensors/data_fetcher_shared_memory_default.cc @@ -9,7 +9,7 @@ namespace { -static bool SetMotionBuffer(content::DeviceMotionHardwareBuffer* buffer, +bool SetMotionBuffer(content::DeviceMotionHardwareBuffer* buffer, bool enabled) { if (!buffer) return false; @@ -19,7 +19,7 @@ static bool SetMotionBuffer(content::DeviceMotionHardwareBuffer* buffer, return true; } -static bool SetOrientationBuffer( +bool SetOrientationBuffer( content::DeviceOrientationHardwareBuffer* buffer, bool enabled) { if (!buffer) return false; @@ -29,7 +29,7 @@ static bool SetOrientationBuffer( return true; } -static bool SetLightBuffer(content::DeviceLightHardwareBuffer* buffer, +bool SetLightBuffer(content::DeviceLightHardwareBuffer* buffer, double lux) { if (!buffer) return false; 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 7b29bfd..8abd447 100644 --- a/content/browser/device_sensors/data_fetcher_shared_memory_win.cc +++ b/content/browser/device_sensors/data_fetcher_shared_memory_win.cc @@ -37,15 +37,15 @@ class DataFetcherSharedMemory::SensorEventSink virtual ~SensorEventSink() {} // IUnknown interface - virtual ULONG STDMETHODCALLTYPE AddRef() override { + ULONG STDMETHODCALLTYPE AddRef() override { return IUnknownImpl::AddRef(); } - virtual ULONG STDMETHODCALLTYPE Release() override { + ULONG STDMETHODCALLTYPE Release() override { return IUnknownImpl::Release(); } - virtual STDMETHODIMP QueryInterface(REFIID riid, void** ppv) override { + STDMETHODIMP QueryInterface(REFIID riid, void** ppv) override { if (riid == __uuidof(ISensorEvents)) { *ppv = static_cast<ISensorEvents*>(this); AddRef(); @@ -108,7 +108,7 @@ class DataFetcherSharedMemory::SensorEventSinkOrientation virtual ~SensorEventSinkOrientation() {} protected: - virtual bool UpdateSharedMemoryBuffer( + bool UpdateSharedMemoryBuffer( ISensor* sensor, ISensorDataReport* new_data) override { double alpha, beta, gamma; bool has_alpha, has_beta, has_gamma; @@ -151,7 +151,7 @@ class DataFetcherSharedMemory::SensorEventSinkMotion virtual ~SensorEventSinkMotion() {} protected: - virtual bool UpdateSharedMemoryBuffer( + bool UpdateSharedMemoryBuffer( ISensor* sensor, ISensorDataReport* new_data) override { SENSOR_TYPE_ID sensor_type = GUID_NULL; @@ -237,7 +237,7 @@ class DataFetcherSharedMemory::SensorEventSinkLight virtual ~SensorEventSinkLight() {} protected: - virtual bool UpdateSharedMemoryBuffer(ISensor* sensor, + bool UpdateSharedMemoryBuffer(ISensor* sensor, ISensorDataReport* new_data) override { double lux; bool has_lux; diff --git a/content/browser/device_sensors/sensor_manager_android.cc b/content/browser/device_sensors/sensor_manager_android.cc index 0158dd7..f63e45a 100644 --- a/content/browser/device_sensors/sensor_manager_android.cc +++ b/content/browser/device_sensors/sensor_manager_android.cc @@ -25,13 +25,13 @@ enum OrientationSensorType { ORIENTATION_SENSOR_MAX = 3, }; -static void UpdateDeviceOrientationHistogram(OrientationSensorType type) { +void UpdateDeviceOrientationHistogram(OrientationSensorType type) { UMA_HISTOGRAM_ENUMERATION("InertialSensor.DeviceOrientationSensorAndroid", type, ORIENTATION_SENSOR_MAX); } -} +} // namespace namespace content { |