Skip to content
This repository has been archived by the owner on Sep 25, 2019. It is now read-only.

Commit

Permalink
Aura desktop: Really implement DesktopActivationClient::OnWillFocusWi…
Browse files Browse the repository at this point in the history
…ndow().

This keeps the skyline focused during tab switching and fixes a shutdown
crasher.

BUG=125106
TEST=none


Review URL: http://codereview.chromium.org/10378002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135260 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
erg@chromium.org committed May 4, 2012
1 parent 54db993 commit 641ed62
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions ui/aura/desktop/desktop_activation_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ aura::Window* DesktopActivationClient::GetActiveWindow() {

bool DesktopActivationClient::OnWillFocusWindow(Window* window,
const Event* event) {
// TODO(erg): Is this OK? Logic is much more nuanced in ash.
return true;
return CanActivateWindow(window);
}

void DesktopActivationClient::OnWindowFocused(aura::Window* window) {
Expand Down

0 comments on commit 641ed62

Please sign in to comment.