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

Unified Diff: ash/shelf/app_list_button.cc

Issue 2130763003: ash: Fix app list button always activated regression (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/app_list_button.cc
diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc
index cbef0f4cf36c92393f5913e6ecbb39e28968dba4..e128dfa36adc63aa909b2830ce5c3e92453de705 100644
--- a/ash/shelf/app_list_button.cc
+++ b/ash/shelf/app_list_button.cc
@@ -56,11 +56,19 @@ AppListButton::AppListButton(InkDropButtonListener* listener,
AppListButton::~AppListButton() {}
void AppListButton::OnAppListShown() {
- AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr);
+ if (ash::MaterialDesignController::IsShelfMaterial()) {
+ AnimateInkDrop(views::InkDropState::ACTIVATED, nullptr);
+ } else {
James Cook 2016/07/07 17:34:26 nit: } { not needed
xiyuan 2016/07/07 17:38:29 Done.
+ SchedulePaint();
+ }
}
void AppListButton::OnAppListDismissed() {
- AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr);
+ if (ash::MaterialDesignController::IsShelfMaterial()) {
+ AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr);
+ } else {
+ SchedulePaint();
+ }
}
bool AppListButton::OnMousePressed(const ui::MouseEvent& event) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698