Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2361)

Unified Diff: ash/app_list/app_list_delegate_impl.cc

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Removed header include in shell.h that was causing gn check failure. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/app_list/app_list_presenter_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..1ff3bfc3df17272f415a0f8d94e2226a6b7e1c56 100644
--- a/ash/app_list/app_list_delegate_impl.cc
+++ b/ash/app_list/app_list_delegate_impl.cc
@@ -5,15 +5,13 @@
#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 {
-
+// TODO(newcomer): Remove this class as a part of crbug.com/726838
AppListDelegateImpl::AppListDelegateImpl() {
Shell::Get()->app_list()->set_delegate(this);
}
@@ -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()) {
+ aura::Window* root_window =
+ ShellPort::Get()->GetRootWindowForDisplayId(display_id);
+ Shell::Get()->OnAppListVisibilityChanged(visible, root_window);
+ }
}
} // namespace ash
« no previous file with comments | « no previous file | ash/app_list/app_list_presenter_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698