Chromium Code Reviews| Index: ash/app_list/app_list_delegate_impl.cc |
| diff --git a/ash/app_list/app_list_delegate_impl.cc b/ash/app_list/app_list_delegate_impl.cc |
| index c8fbf0f0edde5c4af59d8358fb5f6e6c17f0016b..70b6c0efddb9b843d31c74428798a9eafc8c3383 100644 |
| --- a/ash/app_list/app_list_delegate_impl.cc |
| +++ b/ash/app_list/app_list_delegate_impl.cc |
| @@ -11,6 +11,7 @@ |
| #include "ash/shell.h" |
| #include "ash/shell_port.h" |
| #include "ash/wm_window.h" |
| +#include "ui/app_list/app_list_features.h" |
| #include "ui/app_list/presenter/app_list.h" |
| namespace ash { |
| @@ -32,10 +33,19 @@ void AppListDelegateImpl::OnAppListVisibilityChanged(bool visible, |
| if (!app_list_button) |
| return; |
| - if (visible) |
| + if (visible) { |
| app_list_button->OnAppListShown(); |
| - else |
| + if (app_list::features::IsFullscreenAppListEnabled()) { |
| + Shelf* shelf = Shelf::ForWindow(root_window); |
| + shelf->OnAppListIsActive(true); |
|
vadimt
2017/05/26 23:44:08
This repeated part can be moved to after if.
newcomer
2017/05/30 21:37:03
Done.
|
| + } |
| + } else { |
| app_list_button->OnAppListDismissed(); |
| + if (app_list::features::IsFullscreenAppListEnabled()) { |
| + Shelf* shelf = Shelf::ForWindow(root_window); |
| + shelf->OnAppListIsActive(true); |
|
xiyuan
2017/05/30 16:32:33
Should this be "false" ? We probably can use |visi
newcomer
2017/05/30 21:37:03
Correct, I noticed this too and It's fixed.
|
| + } |
| + } |
| } |
| } // namespace ash |