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

Unified Diff: ash/common/shelf/app_list_button.cc

Issue 2447523002: [ash-md] Added different highlighting modes to the InkDropImpl. (Closed)
Patch Set: Fixed compile errors. Created 4 years, 1 month 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
Index: ash/common/shelf/app_list_button.cc
diff --git a/ash/common/shelf/app_list_button.cc b/ash/common/shelf/app_list_button.cc
index 323691fc672b9f90d5db94f174da51a021ec27ae..90434c3ae2dd0e8c9845711163e4b99c836a103e 100644
--- a/ash/common/shelf/app_list_button.cc
+++ b/ash/common/shelf/app_list_button.cc
@@ -24,6 +24,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/paint_vector_icon.h"
+#include "ui/views/animation/ink_drop_impl.h"
#include "ui/views/animation/square_ink_drop_ripple.h"
#include "ui/views/painter.h"
@@ -275,8 +276,11 @@ bool AppListButton::ShouldEnterPushedState(const ui::Event& event) {
return views::ImageButton::ShouldEnterPushedState(event);
}
-bool AppListButton::ShouldShowInkDropHighlight() const {
- return false;
+std::unique_ptr<views::InkDrop> AppListButton::CreateInkDrop() {
+ std::unique_ptr<views::InkDropImpl> ink_drop =
+ CustomButton::CreateDefaultInkDropImpl();
+ ink_drop->SetShowHighlightOnHover(false);
+ return std::move(ink_drop);
}
void AppListButton::SetDrawBackgroundAsActive(bool draw_background_as_active) {

Powered by Google App Engine
This is Rietveld 408576698