Index: ash/common/shelf/overflow_button.h |
diff --git a/ash/common/shelf/overflow_button.h b/ash/common/shelf/overflow_button.h |
index ac2a4faf2b65a1fa037eed75d7426d36c92500a6..19f386704a9afb4124c191d3424087bfa6e59ecd 100644 |
--- a/ash/common/shelf/overflow_button.h |
+++ b/ash/common/shelf/overflow_button.h |
@@ -20,12 +20,15 @@ class OverflowButton : public views::CustomButton { |
~OverflowButton() override; |
void OnShelfAlignmentChanged(); |
+ void OnOverflowBubbleShown(); |
+ void OnOverflowBubbleHidden(); |
private: |
- // views::View: |
- void OnPaint(gfx::Canvas* canvas) override; |
- |
// views::CustomButton: |
+ void OnPaint(gfx::Canvas* canvas) override; |
+ std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override; |
+ bool ShouldEnterPushedState(const ui::Event& event) override; |
+ bool ShouldShowInkDropHighlight() const override; |
void NotifyClick(const ui::Event& event) override; |
// Helper functions to paint the background and foreground of the button |
@@ -37,10 +40,10 @@ class OverflowButton : public views::CustomButton { |
// current shelf state. |
// TODO(tdanderson): Remove this once the material design shelf is enabled |
// by default. See crbug.com/614453. |
- int NonMaterialBackgroundImageId(); |
+ int NonMaterialBackgroundImageId() const; |
// Calculates the bounds of the overflow button based on the shelf alignment. |
- gfx::Rect CalculateButtonBounds(); |
+ gfx::Rect CalculateButtonBounds() const; |
// Used for bottom shelf alignment. |bottom_image_| points to |
// |bottom_image_md_| for material design, otherwise it is points to a |