summaryrefslogtreecommitdiffstats
path: root/ui/aura
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-16 22:16:31 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-16 22:16:31 +0000
commita7cf3d7bd0452be2e067d9848069856aee8407a0 (patch)
tree2e4b54c7f5febd1767894a18d662af6e457e3c23 /ui/aura
parentb95d988591fbb2c56ecd171349bd067d11d047d0 (diff)
downloadchromium_src-a7cf3d7bd0452be2e067d9848069856aee8407a0.zip
chromium_src-a7cf3d7bd0452be2e067d9848069856aee8407a0.tar.gz
chromium_src-a7cf3d7bd0452be2e067d9848069856aee8407a0.tar.bz2
aura: add the newly focused window argument to WindowDelegate::OnBlur()
BUG=106958 TEST=none Review URL: http://codereview.chromium.org/9403025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122366 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura')
-rw-r--r--ui/aura/root_window.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index c164ad2..ffa6aa2 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -726,9 +726,10 @@ void RootWindow::SetFocusedWindow(Window* focused_window) {
return;
}
- if (focused_window_ && focused_window_->delegate())
- focused_window_->delegate()->OnBlur();
+ Window* old_focused_window = focused_window_;
focused_window_ = focused_window;
+ if (old_focused_window && old_focused_window->delegate())
+ old_focused_window->delegate()->OnBlur();
if (focused_window_ && focused_window_->delegate())
focused_window_->delegate()->OnFocus();
if (focused_window_) {