Chromium Code Reviews| Index: ash/app_list/app_list_presenter_delegate.cc |
| diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc |
| index 258a88d4903e4a7b8a6073e9559ac0ccb668cbca..10833f24eba4e6a96b85a9c6dad28b86e7ccb189 100644 |
| --- a/ash/app_list/app_list_presenter_delegate.cc |
| +++ b/ash/app_list/app_list_presenter_delegate.cc |
| @@ -129,6 +129,12 @@ void AppListPresenterDelegate::OnShown(int64_t display_id) { |
| Shelf::ForWindow(root_window)->shelf_widget()->GetAppListButton(); |
| if (app_list_button) |
| app_list_button->OnAppListShown(); |
| + |
| + // Notify the shelf that the app list is active so the backgrounds do not |
| + // overlap. |
| + Shelf* shelf = Shelf::ForWindow(root_window); |
|
vadimt
2017/05/26 01:27:56
You can move this inside if.
newcomer
2017/05/26 17:11:27
Done.
|
| + if (app_list::features::IsFullscreenAppListEnabled()) |
| + shelf->OnAppListIsActive(true); |
| } |
| void AppListPresenterDelegate::OnDismissed() { |
| @@ -142,6 +148,11 @@ void AppListPresenterDelegate::OnDismissed() { |
| AppListButton* app_list_button = shelf->shelf_widget()->GetAppListButton(); |
| if (app_list_button) |
| app_list_button->OnAppListDismissed(); |
| + if (app_list::features::IsFullscreenAppListEnabled()) { |
| + // Notify the shelf that the app list is being dismissed so it can |
| + // re-enable its transparent background. |
| + shelf->OnAppListIsActive(false); |
| + } |
| } |
| void AppListPresenterDelegate::UpdateBounds() { |