diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 22:08:15 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 22:08:15 +0000 |
| commit | 5a9374b19b1be32b4abfffb0a304f28ec6ccc72a (patch) | |
| tree | 535c17c5a04be2959afffbe42288502b3745fd32 /ui/aura/desktop.cc | |
| parent | f32a8b30d6a18fa29e0a9ee5596eeae620a76599 (diff) | |
| download | chromium_src-5a9374b19b1be32b4abfffb0a304f28ec6ccc72a.zip chromium_src-5a9374b19b1be32b4abfffb0a304f28ec6ccc72a.tar.gz chromium_src-5a9374b19b1be32b4abfffb0a304f28ec6ccc72a.tar.bz2 | |
Gets disable inactive frame rendering to work correctly for aura. This
is needed for bubbles.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8351042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/desktop.cc')
| -rw-r--r-- | ui/aura/desktop.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc index 2c747d2..a6c909a 100644 --- a/ui/aura/desktop.cc +++ b/ui/aura/desktop.cc @@ -362,9 +362,13 @@ void Desktop::SetActiveWindow(Window* window, Window* to_focus) { if (active_window_ == window) return; - if (active_window_ && active_window_->delegate()) - active_window_->delegate()->OnLostActive(); + Window* old_active = active_window_; active_window_ = window; + // Invoke OnLostActive after we've changed the active window. That way if the + // delegate queries for active state it doesn't think the window is still + // active. + if (old_active && old_active->delegate()) + old_active->delegate()->OnLostActive(); if (active_window_) { active_window_->parent()->MoveChildToFront(active_window_); if (active_window_->delegate()) |