diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/base/power_monitor | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/base/power_monitor')
6 files changed, 10 insertions, 4 deletions
diff --git a/chromium/base/power_monitor/power_monitor.cc b/chromium/base/power_monitor/power_monitor.cc index 98c9c68c1df..10332995941 100644 --- a/chromium/base/power_monitor/power_monitor.cc +++ b/chromium/base/power_monitor/power_monitor.cc @@ -3,6 +3,9 @@ // found in the LICENSE file. #include "base/power_monitor/power_monitor.h" + +#include <utility> + #include "base/power_monitor/power_monitor_source.h" namespace base { @@ -11,7 +14,7 @@ static PowerMonitor* g_power_monitor = NULL; PowerMonitor::PowerMonitor(scoped_ptr<PowerMonitorSource> source) : observers_(new ObserverListThreadSafe<PowerObserver>()), - source_(source.Pass()) { + source_(std::move(source)) { DCHECK(!g_power_monitor); g_power_monitor = this; } diff --git a/chromium/base/power_monitor/power_monitor.h b/chromium/base/power_monitor/power_monitor.h index 4acb3bf122d..683eeb9733c 100644 --- a/chromium/base/power_monitor/power_monitor.h +++ b/chromium/base/power_monitor/power_monitor.h @@ -6,7 +6,7 @@ #define BASE_POWER_MONITOR_POWER_MONITOR_H_ #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list_threadsafe.h" #include "base/power_monitor/power_observer.h" diff --git a/chromium/base/power_monitor/power_monitor_device_source.cc b/chromium/base/power_monitor/power_monitor_device_source.cc index 0a3997517ec..f54b7ba3c83 100644 --- a/chromium/base/power_monitor/power_monitor_device_source.cc +++ b/chromium/base/power_monitor/power_monitor_device_source.cc @@ -5,6 +5,7 @@ #include "base/power_monitor/power_monitor_device_source.h" #include "base/time/time.h" +#include "build/build_config.h" namespace base { diff --git a/chromium/base/power_monitor/power_monitor_device_source.h b/chromium/base/power_monitor/power_monitor_device_source.h index fa0b039bfb4..2dabac8865e 100644 --- a/chromium/base/power_monitor/power_monitor_device_source.h +++ b/chromium/base/power_monitor/power_monitor_device_source.h @@ -6,11 +6,12 @@ #define BASE_POWER_MONITOR_POWER_MONITOR_DEVICE_SOURCE_H_ #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list_threadsafe.h" #include "base/power_monitor/power_monitor_source.h" #include "base/power_monitor/power_observer.h" +#include "build/build_config.h" #if defined(OS_WIN) #include <windows.h> diff --git a/chromium/base/power_monitor/power_monitor_source.h b/chromium/base/power_monitor/power_monitor_source.h index b8f41850ef2..e63f4f82bf9 100644 --- a/chromium/base/power_monitor/power_monitor_source.h +++ b/chromium/base/power_monitor/power_monitor_source.h @@ -6,7 +6,7 @@ #define BASE_POWER_MONITOR_POWER_MONITOR_SOURCE_H_ #include "base/base_export.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/observer_list_threadsafe.h" #include "base/synchronization/lock.h" diff --git a/chromium/base/power_monitor/power_monitor_unittest.cc b/chromium/base/power_monitor/power_monitor_unittest.cc index 2df82618f4c..798a21c8c47 100644 --- a/chromium/base/power_monitor/power_monitor_unittest.cc +++ b/chromium/base/power_monitor/power_monitor_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/macros.h" #include "base/power_monitor/power_monitor.h" #include "base/test/power_monitor_test_base.h" #include "testing/gtest/include/gtest/gtest.h" |