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

Unified Diff: ash/app_list/app_list_presenter_delegate.cc

Issue 2934673002: Revert of Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: 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 | « ash/app_list/app_list_delegate_impl.cc ('k') | ash/app_list/app_list_presenter_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 fc81a0ab465a3c04fea5fb455ba19c0594ed625a..01b2bcc52269651e19473af14eefae7b9fea4f0a 100644
--- a/ash/app_list/app_list_presenter_delegate.cc
+++ b/ash/app_list/app_list_presenter_delegate.cc
@@ -119,9 +119,13 @@
void AppListPresenterDelegate::OnShown(int64_t display_id) {
is_visible_ = true;
+ // Update applist button status when app list visibility is changed.
aura::Window* root_window =
ShellPort::Get()->GetRootWindowForDisplayId(display_id);
- Shell::Get()->OnAppListVisibilityChanged(is_visible_, root_window);
+ AppListButton* app_list_button =
+ Shelf::ForWindow(root_window)->shelf_widget()->GetAppListButton();
+ if (app_list_button)
+ app_list_button->OnAppListShown();
}
void AppListPresenterDelegate::OnDismissed() {
@@ -129,9 +133,12 @@
DCHECK(view_);
is_visible_ = false;
- aura::Window* root_window =
- RootWindowController::ForTargetRootWindow()->GetRootWindow();
- Shell::Get()->OnAppListVisibilityChanged(is_visible_, root_window);
+
+ // Update applist button status when app list visibility is changed.
+ Shelf* shelf = Shelf::ForWindow(view_->GetWidget()->GetNativeWindow());
+ AppListButton* app_list_button = shelf->shelf_widget()->GetAppListButton();
+ if (app_list_button)
+ app_list_button->OnAppListDismissed();
}
void AppListPresenterDelegate::UpdateBounds() {
« no previous file with comments | « ash/app_list/app_list_delegate_impl.cc ('k') | ash/app_list/app_list_presenter_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698