diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/base/power_monitor | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/base/power_monitor')
| -rw-r--r-- | chromium/base/power_monitor/power_monitor_device_source_mac.mm | 2 | ||||
| -rw-r--r-- | chromium/base/power_monitor/power_monitor_device_source_win.cc | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/chromium/base/power_monitor/power_monitor_device_source_mac.mm b/chromium/base/power_monitor/power_monitor_device_source_mac.mm index 61e439630e7..8c48117e220 100644 --- a/chromium/base/power_monitor/power_monitor_device_source_mac.mm +++ b/chromium/base/power_monitor/power_monitor_device_source_mac.mm @@ -10,8 +10,8 @@ #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_monitor_source.h" -#include <IOKit/pwr_mgt/IOPMLib.h> #include <IOKit/IOMessage.h> +#include <IOKit/pwr_mgt/IOPMLib.h> namespace base { diff --git a/chromium/base/power_monitor/power_monitor_device_source_win.cc b/chromium/base/power_monitor/power_monitor_device_source_win.cc index 0e199dcddbb..69bc6aa2cdc 100644 --- a/chromium/base/power_monitor/power_monitor_device_source_win.cc +++ b/chromium/base/power_monitor/power_monitor_device_source_win.cc @@ -99,11 +99,6 @@ LRESULT CALLBACK PowerMonitorDeviceSource::PowerMessageWindow::WndProcThunk( UINT message, WPARAM wparam, LPARAM lparam) { - // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION( - "440919 PowerMonitorDeviceSource::PowerMessageWindow::WndProcThunk")); - switch (message) { case WM_POWERBROADCAST: ProcessWmPowerBroadcastMessage(wparam); |