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

Unified Diff: ash/shelf/overflow_button.h

Issue 2033553003: Add MD ink drop ripple to shelf app items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added tests 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
Index: ash/shelf/overflow_button.h
diff --git a/ash/shelf/overflow_button.h b/ash/shelf/overflow_button.h
index 205f3a55384168717e84c9d44d8ad48e949b5fc2..75cb445d5152cb34296fc3d54965612687398f7d 100644
--- a/ash/shelf/overflow_button.h
+++ b/ash/shelf/overflow_button.h
@@ -13,12 +13,12 @@
namespace ash {
-class Shelf;
+class ShelfView;
// Shelf overflow chevron button.
class OverflowButton : public views::CustomButton {
public:
- OverflowButton(views::ButtonListener* listener, Shelf* shelf);
+ explicit OverflowButton(ShelfView* shelf_view);
~OverflowButton() override;
void OnShelfAlignmentChanged();
@@ -27,6 +27,9 @@ class OverflowButton : public views::CustomButton {
// views::View:
void OnPaint(gfx::Canvas* canvas) override;
+ // views::CustomButton:
+ void NotifyClick(const ui::Event& event) override;
+
// Helper functions to paint the background and foreground of the button
// at |bounds|.
void PaintBackground(gfx::Canvas* canvas, const gfx::Rect& bounds);
@@ -49,7 +52,7 @@ class OverflowButton : public views::CustomButton {
gfx::ImageSkia right_image_;
// Bottom image is owned by the resource bundle.
const gfx::ImageSkia* bottom_image_;
- Shelf* shelf_;
+ ShelfView* shelf_view_;
James Cook 2016/06/13 19:55:35 Aside: This is fine for this CL, but in the medium
mohsen 2016/06/14 06:24:38 I guess this should have been addressed by introdu
DISALLOW_COPY_AND_ASSIGN(OverflowButton);
};

Powered by Google App Engine
This is Rietveld 408576698