diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
| commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
| tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/base/power_monitor | |
| parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/power_monitor')
4 files changed, 8 insertions, 6 deletions
diff --git a/chromium/base/power_monitor/power_monitor.cc b/chromium/base/power_monitor/power_monitor.cc index 11082df6957..30e06a2a833 100644 --- a/chromium/base/power_monitor/power_monitor.cc +++ b/chromium/base/power_monitor/power_monitor.cc @@ -10,7 +10,7 @@ namespace base { -static PowerMonitor* g_power_monitor = NULL; +static PowerMonitor* g_power_monitor = nullptr; PowerMonitor::PowerMonitor(std::unique_ptr<PowerMonitorSource> source) : observers_(new ObserverListThreadSafe<PowerObserver>()), @@ -21,7 +21,7 @@ PowerMonitor::PowerMonitor(std::unique_ptr<PowerMonitorSource> source) PowerMonitor::~PowerMonitor() { DCHECK_EQ(this, g_power_monitor); - g_power_monitor = NULL; + g_power_monitor = nullptr; } // static diff --git a/chromium/base/power_monitor/power_monitor_device_source_android.cc b/chromium/base/power_monitor/power_monitor_device_source_android.cc index 5a764759b13..7688513501d 100644 --- a/chromium/base/power_monitor/power_monitor_device_source_android.cc +++ b/chromium/base/power_monitor/power_monitor_device_source_android.cc @@ -19,7 +19,9 @@ namespace android { // Native implementation of PowerMonitor.java. Note: This will be invoked by // PowerMonitor.java shortly after startup to set the correct initial value for // "is on battery power." -void OnBatteryChargingChanged(JNIEnv* env, const JavaParamRef<jclass>& clazz) { +void JNI_PowerMonitor_OnBatteryChargingChanged( + JNIEnv* env, + const JavaParamRef<jclass>& clazz) { ProcessPowerEventHelper(PowerMonitorSource::POWER_STATE_EVENT); } diff --git a/chromium/base/power_monitor/power_monitor_source.cc b/chromium/base/power_monitor/power_monitor_source.cc index 5d27a0e5a07..d4757b0629f 100644 --- a/chromium/base/power_monitor/power_monitor_source.cc +++ b/chromium/base/power_monitor/power_monitor_source.cc @@ -9,8 +9,8 @@ namespace base { -PowerMonitorSource::PowerMonitorSource() {} -PowerMonitorSource::~PowerMonitorSource() {} +PowerMonitorSource::PowerMonitorSource() = default; +PowerMonitorSource::~PowerMonitorSource() = default; bool PowerMonitorSource::IsOnBatteryPower() { AutoLock auto_lock(battery_lock_); diff --git a/chromium/base/power_monitor/power_monitor_unittest.cc b/chromium/base/power_monitor/power_monitor_unittest.cc index f1c24598740..7f2a84b774b 100644 --- a/chromium/base/power_monitor/power_monitor_unittest.cc +++ b/chromium/base/power_monitor/power_monitor_unittest.cc @@ -17,7 +17,7 @@ class PowerMonitorTest : public testing::Test { power_monitor_.reset(new PowerMonitor( std::unique_ptr<PowerMonitorSource>(power_monitor_source_))); } - ~PowerMonitorTest() override {} + ~PowerMonitorTest() override = default; PowerMonitorTestSource* source() { return power_monitor_source_; } PowerMonitor* monitor() { return power_monitor_.get(); } |