diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 17:02:28 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 17:02:28 +0000 |
| commit | 5924a0b4c58a2f889752a6c76256895a62b31eb0 (patch) | |
| tree | 9e597fb8be9901436a2ab2a85006e2c321e34572 /ash/wm/video_detector.h | |
| parent | f7359809aea977080efbbdcc91b6136d4a0c9de6 (diff) | |
| download | chromium_src-5924a0b4c58a2f889752a6c76256895a62b31eb0.zip chromium_src-5924a0b4c58a2f889752a6c76256895a62b31eb0.tar.gz chromium_src-5924a0b4c58a2f889752a6c76256895a62b31eb0.tar.bz2 | |
Cleans up a couple of places that were installing WindowObservers but
never removing them. This is problematic as it is possible for a
Window to be destroyed after the shell.
ScopedObserver is pretty generic, but I'll leave it here for now.
BUG=124860
TEST=covered by unit test
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10206027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/video_detector.h')
| -rw-r--r-- | ash/wm/video_detector.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h index 3ac083c..3a8aaa1 100644 --- a/ash/wm/video_detector.h +++ b/ash/wm/video_detector.h @@ -9,6 +9,7 @@ #include <map> #include "ash/ash_export.h" +#include "ash/wm/scoped_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/linked_ptr.h" @@ -92,6 +93,9 @@ class ASH_EXPORT VideoDetector : public aura::EnvObserver, // simulate the passage of time. base::TimeTicks now_for_test_; + internal::ScopedObserver<aura::Window, aura::WindowObserver> + observer_manager_; + DISALLOW_COPY_AND_ASSIGN(VideoDetector); }; |