diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 19:12:19 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 19:12:19 +0000 |
| commit | cb0a22dd9313a01e4fab5302094d13bd651a03ad (patch) | |
| tree | 644c1cba9aa2b13c27af706bfa8a3b65c029153f /ash | |
| parent | 3d61a7f64764bd622a96176fdf9aa945de283ac7 (diff) | |
| download | chromium_src-cb0a22dd9313a01e4fab5302094d13bd651a03ad.zip chromium_src-cb0a22dd9313a01e4fab5302094d13bd651a03ad.tar.gz chromium_src-cb0a22dd9313a01e4fab5302094d13bd651a03ad.tar.bz2 | |
ash/app_list: Dismiss app list when sys tray bubble shows.
App list is a bubble itself now and should be dimissed when system tray bubble
shows up.
BUG=none.
TEST=Bring up app list bubble then bring up system tray bubble. Verify that app list bubble closes.
Review URL: https://chromiumcodereview.appspot.com/10735062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index efe3ba8..1fa0ac5 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -4,7 +4,6 @@ #include "ash/wm/app_list_controller.h" -#include "ash/ash_switches.h" #include "ash/launcher/launcher.h" #include "ash/root_window_controller.h" #include "ash/shell.h" @@ -251,13 +250,8 @@ void AppListController::OnWindowFocused(aura::Window* window) { aura::Window* applist_container = Shell::GetContainer( Shell::GetPrimaryRootWindow(), kShellWindowId_AppListContainer); - aura::Window* bubble_container = Shell::GetContainer( - Shell::GetPrimaryRootWindow(), - kShellWindowId_SettingBubbleContainer); - if (window->parent() != applist_container && - window->parent() != bubble_container) { + if (window->parent() != applist_container) SetVisible(false); - } } } |