diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 01:04:11 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 01:04:11 +0000 |
| commit | 84d388914a464d1c04da5a666660df68fa00862f (patch) | |
| tree | ec4e7dfaa530604444a723291bee300e97e093e6 /ui/aura | |
| parent | ac97dd18c9af500e14395220e68eb1fe54e2b263 (diff) | |
| download | chromium_src-84d388914a464d1c04da5a666660df68fa00862f.zip chromium_src-84d388914a464d1c04da5a666660df68fa00862f.tar.gz chromium_src-84d388914a464d1c04da5a666660df68fa00862f.tar.bz2 | |
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
Diffstat (limited to 'ui/aura')
| -rw-r--r-- | ui/aura/desktop/desktop_activation_client.cc | 3 |
1 files changed, 1 insertions, 2 deletions
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) { |