Chromium Code Reviews| 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) { |