diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 22:41:33 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-01 22:41:33 +0000 |
| commit | d4a678be860fe5de9431229fbf166972f717d09b (patch) | |
| tree | 0d97bfb8bacd2d05c8084602c6a221c42193a1b9 /ash/wm/app_list_controller.cc | |
| parent | 0a612e0146b4cdbe0fc08d7e66c9c5a57c1c252a (diff) | |
| download | chromium_src-d4a678be860fe5de9431229fbf166972f717d09b.zip chromium_src-d4a678be860fe5de9431229fbf166972f717d09b.tar.gz chromium_src-d4a678be860fe5de9431229fbf166972f717d09b.tar.bz2 | |
Losing focus should hide app list.
BUG=276513
TEST=WindowSelectorTest.SelectingHidesAppList
Review URL: https://codereview.chromium.org/25260004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index 89f6a78..152c995 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -328,12 +328,12 @@ void AppListController::OnGestureEvent(ui::GestureEvent* event) { void AppListController::OnWindowFocused(aura::Window* gained_focus, aura::Window* lost_focus) { - if (gained_focus && view_ && is_visible_) { + if (lost_focus && view_ && is_visible_) { aura::Window* applist_container = - GetRootWindowController(gained_focus->GetRootWindow())->GetContainer( + GetRootWindowController(lost_focus->GetRootWindow())->GetContainer( kShellWindowId_AppListContainer); - if (gained_focus->parent() != applist_container) - SetVisible(false, gained_focus); + if (applist_container->Contains(lost_focus)) + SetVisible(false, lost_focus); } } |