diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 07:56:55 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 07:56:55 +0000 |
| commit | ded58fd466862cb75930af93350f9cb9c9bacea3 (patch) | |
| tree | e356d8b92f9e5675ec5810ee7676e35b855f2ccb /ash/ash.gyp | |
| parent | 3f0855c057b90feb3f77176d67d990d9e8d1097c (diff) | |
| download | chromium_src-ded58fd466862cb75930af93350f9cb9c9bacea3.zip chromium_src-ded58fd466862cb75930af93350f9cb9c9bacea3.tar.gz chromium_src-ded58fd466862cb75930af93350f9cb9c9bacea3.tar.bz2 | |
Reland "chromeos: Move several power-related classes to Ash"
This reverts r227562 to reland r227544.
Original description: "Move SuspendObserver,
UserActivityNotifier, and VideoActivityNotifier from
chrome/browser/chromeos/power to ash/system/chromeos/power."
This iteration makes ash::Shell's destructor destroy
VideoActivityNotifier before VideoDetector to avoid a
use-after-free.
BUG=none
Review URL: https://codereview.chromium.org/26569003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
| -rw-r--r-- | ash/ash.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 391b487..29e136b 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -262,8 +262,14 @@ 'system/chromeos/power/power_status.h', 'system/chromeos/power/power_status_view.cc', 'system/chromeos/power/power_status_view.h', + 'system/chromeos/power/suspend_observer.cc', + 'system/chromeos/power/suspend_observer.h', 'system/chromeos/power/tray_power.cc', 'system/chromeos/power/tray_power.h', + 'system/chromeos/power/user_activity_notifier.cc', + 'system/chromeos/power/user_activity_notifier.h', + 'system/chromeos/power/video_activity_notifier.cc', + 'system/chromeos/power/video_activity_notifier.h', 'system/chromeos/screen_security/screen_capture_observer.h', 'system/chromeos/screen_security/screen_capture_tray_item.cc', 'system/chromeos/screen_security/screen_capture_tray_item.h', |