diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 21:47:30 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 21:47:30 +0000 |
| commit | 28f57b316a5fc14cf36026af2438f0a68aa0922c (patch) | |
| tree | 8e080f45b975727f19c738c6e9cb4c267404e3cb /ash/wm/video_detector.h | |
| parent | c33dc2e2ec14c521ad0884c39d668d3181497735 (diff) | |
| download | chromium_src-28f57b316a5fc14cf36026af2438f0a68aa0922c.zip chromium_src-28f57b316a5fc14cf36026af2438f0a68aa0922c.tar.gz chromium_src-28f57b316a5fc14cf36026af2438f0a68aa0922c.tar.bz2 | |
linux_aura: Redo how activation is handled.
This is an almost complete overhaul of how activation works.
oshima@ recently changed ActivationController/FocusManager so that there was a single one per desktop instead of per RootWindow. Because of this, our code that listens for activation changes from X11 is wrong, and has been moved to its own class which also owns the singleton ActivationController.
DesktopActivationController had a wrong model. It should be activating the toplevel window like BrowserFrameAura, even across RootWindows. This has been fixed.
Also moved the utility class ScopedObserver to base/.
TODO: This fixes all activation problems I've seen except for trying to cause a bubble to show when the chrome window is deactivated while a non-chrome window is active.
BUG=130798,133055,133089
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10631008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/video_detector.h')
| -rw-r--r-- | ash/wm/video_detector.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h index 3a8aaa1..1cd77a5 100644 --- a/ash/wm/video_detector.h +++ b/ash/wm/video_detector.h @@ -9,11 +9,11 @@ #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" #include "base/observer_list.h" +#include "base/scoped_observer.h" #include "base/time.h" #include "ui/aura/env_observer.h" #include "ui/aura/window_observer.h" @@ -93,8 +93,7 @@ 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_; + ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_; DISALLOW_COPY_AND_ASSIGN(VideoDetector); }; |