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

Unified Diff: ash/shelf/app_list_button.h

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple
Patch Set: Rebased Created 4 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/first_run/first_run_helper_impl.cc ('k') | ash/shelf/app_list_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/app_list_button.h
diff --git a/ash/shelf/app_list_button.h b/ash/shelf/app_list_button.h
index df3d2a1eb310cf8ad5edd3ea5d44308e13ab4bf3..ac7d918050912dedb0e10b4b1dfa3c1b5eb23596 100644
--- a/ash/shelf/app_list_button.h
+++ b/ash/shelf/app_list_button.h
@@ -5,6 +5,7 @@
#ifndef ASH_SHELF_APP_LIST_BUTTON_H_
#define ASH_SHELF_APP_LIST_BUTTON_H_
+#include "ash/ash_export.h"
#include "base/macros.h"
#include "ui/views/controls/button/image_button.h"
@@ -13,12 +14,15 @@ class InkDropButtonListener;
class ShelfView;
// Button used for the AppList icon on the shelf.
-class AppListButton : public views::ImageButton {
+class ASH_EXPORT AppListButton : public views::ImageButton {
public:
explicit AppListButton(InkDropButtonListener* listener,
ShelfView* shelf_view);
~AppListButton() override;
+ void OnAppListShown();
+ void OnAppListDismissed();
+
bool draw_background_as_active() { return draw_background_as_active_; }
protected:
@@ -29,7 +33,10 @@ class AppListButton : public views::ImageButton {
bool OnMouseDragged(const ui::MouseEvent& event) override;
void OnPaint(gfx::Canvas* canvas) override;
void GetAccessibleState(ui::AXViewState* state) override;
+ std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
void NotifyClick(const ui::Event& event) override;
+ bool ShouldEnterPushedState(const ui::Event& event) override;
+ bool ShouldShowInkDropHighlight() const override;
// ui::EventHandler overrides:
void OnGestureEvent(ui::GestureEvent* event) override;
« no previous file with comments | « ash/first_run/first_run_helper_impl.cc ('k') | ash/shelf/app_list_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698