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

Side by Side Diff: ui/views/controls/button/label_button.h

Issue 2042073002: Centered flood fill style ink drop ripples on mouse/touch points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed LocatedEvent::AsLocatedIfLocatedEvent() as FromIfValid(). 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 void SetBorder(std::unique_ptr<Border> border) override; 99 void SetBorder(std::unique_ptr<Border> border) override;
100 gfx::Size GetPreferredSize() const override; 100 gfx::Size GetPreferredSize() const override;
101 int GetHeightForWidth(int w) const override; 101 int GetHeightForWidth(int w) const override;
102 void Layout() override; 102 void Layout() override;
103 const char* GetClassName() const override; 103 const char* GetClassName() const override;
104 void EnableCanvasFlippingForRTLUI(bool flip) override; 104 void EnableCanvasFlippingForRTLUI(bool flip) override;
105 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; 105 void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
106 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; 106 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
107 std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override; 107 std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override;
108 std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override; 108 std::unique_ptr<InkDropHighlight> CreateInkDropHighlight() const override;
109 gfx::Point GetInkDropCenter() const override;
110 109
111 protected: 110 protected:
112 ImageView* image() const { return image_; } 111 ImageView* image() const { return image_; }
113 Label* label() const { return label_; } 112 Label* label() const { return label_; }
114 113
115 bool explicitly_set_normal_color() const { 114 bool explicitly_set_normal_color() const {
116 return explicitly_set_colors_[STATE_NORMAL]; 115 return explicitly_set_colors_[STATE_NORMAL];
117 } 116 }
118 117
119 // Returns the available area for the label and image. Subclasses can change 118 // Returns the available area for the label and image. Subclasses can change
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 gfx::HorizontalAlignment horizontal_alignment_; 229 gfx::HorizontalAlignment horizontal_alignment_;
231 230
232 std::unique_ptr<Painter> focus_painter_; 231 std::unique_ptr<Painter> focus_painter_;
233 232
234 DISALLOW_COPY_AND_ASSIGN(LabelButton); 233 DISALLOW_COPY_AND_ASSIGN(LabelButton);
235 }; 234 };
236 235
237 } // namespace views 236 } // namespace views
238 237
239 #endif // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_ 238 #endif // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
OLDNEW
« 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