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

Unified Diff: ui/views/controls/button/label_button.h

Issue 2447523002: [ash-md] Added different highlighting modes to the InkDropImpl. (Closed)
Patch Set: Fixed InkDropHostView::GetInkDrop() to use CreateInkDrop(). 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
« no previous file with comments | « ui/views/controls/button/custom_button.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/label_button.h
diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h
index 96fc7af6b1f412de203a5070defdb1d600f777ce..7baf940d2c7abab21241ee6726af778732483ca7 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -19,8 +19,6 @@
namespace views {
-class InkDropRipple;
-class InkDropHighlight;
class LabelButtonBorder;
class Painter;
@@ -105,6 +103,7 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
void EnableCanvasFlippingForRTLUI(bool flip) override;
void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
+ std::unique_ptr<InkDrop> CreateInkDrop() override;
std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override;
std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override;
@@ -181,6 +180,10 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
// correct for the current background.
void ResetLabelEnabledColor();
+ // Returns true if the CreateInkDrop*() methods should create flood fill ink
+ // drop components.
+ bool UseFloodFillInkDrop() const;
+
// The image and label shown in the button.
ImageView* image_;
Label* label_;
« no previous file with comments | « ui/views/controls/button/custom_button.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698