From 84d388914a464d1c04da5a666660df68fa00862f Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Fri, 4 May 2012 01:04:11 +0000 Subject: Aura desktop: Really implement DesktopActivationClient::OnWillFocusWindow(). 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 --- ui/aura/desktop/desktop_activation_client.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ui/aura') diff --git a/ui/aura/desktop/desktop_activation_client.cc b/ui/aura/desktop/desktop_activation_client.cc index 38e0e46..183a0ee 100644 --- a/ui/aura/desktop/desktop_activation_client.cc +++ b/ui/aura/desktop/desktop_activation_client.cc @@ -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) { -- cgit v1.1