diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 22:13:38 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 22:13:38 +0000 |
| commit | 6aa614a9ac971f5b027eee0749f211883f1d6934 (patch) | |
| tree | ab48ab3a1a3e6a9ebebc19f7579f55dd273ebae8 /ash/shell.cc | |
| parent | 1d6ed7bc2007d2521d14f8bdaf1962ba499d0b81 (diff) | |
| download | chromium_src-6aa614a9ac971f5b027eee0749f211883f1d6934.zip chromium_src-6aa614a9ac971f5b027eee0749f211883f1d6934.tar.gz chromium_src-6aa614a9ac971f5b027eee0749f211883f1d6934.tar.bz2 | |
Reland "aura/chromeos: Avoid suspending while video is playing."
This reverts r118199, which was a revert of r118171.
aura::VideoPropertyWriter (not ash::VideoDetector -- made a
typo in the revert's description) was outliving the
ash::Shell singleton. Now we explicitly destroy the
VideoPropertyWriter before the shell.
The only differences from r118171 are the addition of the
final chunk in chrome_browser_main_chromeos.cc and a change
to reparent a window in VideoDetectorTest.WindowNotVisible
needed in response to r118259.
BUG=110114
TEST=avoided missing DCHECK on shutdown in trybot logs this time
Review URL: http://codereview.chromium.org/9254018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 3f50105..40df7c9 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -37,6 +37,7 @@ #include "ash/wm/window_modality_controller.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" +#include "ash/wm/video_detector.h" #include "base/bind.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" @@ -266,6 +267,7 @@ void Shell::Init() { drag_drop_controller_.reset(new internal::DragDropController); power_button_controller_.reset(new PowerButtonController); + video_detector_.reset(new VideoDetector); window_cycle_controller_.reset(new WindowCycleController); } |