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 ef2f8c9b579a4da651b5222e1ce36f44e52c55d6..91d84efab8ae15e8c609b882376ffb5b4fd44a7c 100644 |
| --- a/ash/app_list/app_list_delegate_impl.cc |
| +++ b/ash/app_list/app_list_delegate_impl.cc |
| @@ -5,11 +5,9 @@ |
| #include "ash/app_list/app_list_delegate_impl.h" |
| #include "ash/root_window_controller.h" |
| -#include "ash/shelf/app_list_button.h" |
| -#include "ash/shelf/shelf.h" |
| -#include "ash/shelf/shelf_widget.h" |
| #include "ash/shell.h" |
| #include "ash/shell_port.h" |
| +#include "ui/app_list/app_list_features.h" |
| #include "ui/app_list/presenter/app_list.h" |
| namespace ash { |
| @@ -24,17 +22,11 @@ AppListDelegateImpl::~AppListDelegateImpl() { |
| void AppListDelegateImpl::OnAppListVisibilityChanged(bool visible, |
| int64_t display_id) { |
| - aura::Window* root_window = |
| - ShellPort::Get()->GetRootWindowForDisplayId(display_id); |
| - AppListButton* app_list_button = |
| - Shelf::ForWindow(root_window)->shelf_widget()->GetAppListButton(); |
| - if (!app_list_button) |
| - return; |
| - |
| - if (visible) |
| - app_list_button->OnAppListShown(); |
| - else |
| - app_list_button->OnAppListDismissed(); |
| + if (app_list::features::IsFullscreenAppListEnabled()) { |
|
sky
2017/06/09 18:22:02
Please add the TODO pointer to the bug you filed a
newcomer
2017/06/09 18:59:06
Done.
|
| + aura::Window* root_window = |
| + ShellPort::Get()->GetRootWindowForDisplayId(display_id); |
| + Shell::Get()->OnAppListVisibilityChanged(visible, root_window); |
| + } |
| } |
| } // namespace ash |