Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_CUSTOM_BUTTON_H_ | 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ |
| 6 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ | 6 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 // part of the focus chain, unless in accessibility mode. Call | 22 // part of the focus chain, unless in accessibility mode. Call |
| 23 // SetFocusForPlatform() to make it part of the focus chain. | 23 // SetFocusForPlatform() to make it part of the focus chain. |
| 24 class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate { | 24 class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate { |
| 25 public: | 25 public: |
| 26 // An enum describing the events on which a button should notify its listener. | 26 // An enum describing the events on which a button should notify its listener. |
| 27 enum NotifyAction { | 27 enum NotifyAction { |
| 28 NOTIFY_ON_PRESS, | 28 NOTIFY_ON_PRESS, |
| 29 NOTIFY_ON_RELEASE, | 29 NOTIFY_ON_RELEASE, |
| 30 }; | 30 }; |
| 31 | 31 |
| 32 // An enum describing the action to perform on a key press. | |
|
tapted
2017/01/04 04:54:31
since this deals with press and release, the comme
karandeepb
2017/01/04 06:14:45
Changed to "An enum describing the events on which
tapted
2017/01/05 00:34:41
sg
| |
| 33 enum ButtonAction { | |
| 34 ACTION_PRESS, // The button is pressed on OnKeyPressed and clicked on | |
|
tapted
2017/01/04 04:54:31
Perhaps CLICK_ON_PRESS / CLICK_ON_RELEASE / CLICK_
karandeepb
2017/01/04 06:14:45
Yeah this seems better.
| |
| 35 // OnKeyReleased. | |
| 36 ACTION_CLICK, // The button is clicked on OnKeyPressed. | |
| 37 ACTION_NONE, // No action is performed. | |
| 38 }; | |
| 39 | |
| 32 // The menu button's class name. | 40 // The menu button's class name. |
| 33 static const char kViewClassName[]; | 41 static const char kViewClassName[]; |
| 34 | 42 |
| 35 static const CustomButton* AsCustomButton(const View* view); | 43 static const CustomButton* AsCustomButton(const View* view); |
| 36 static CustomButton* AsCustomButton(View* view); | 44 static CustomButton* AsCustomButton(View* view); |
| 37 | 45 |
| 38 ~CustomButton() override; | 46 ~CustomButton() override; |
| 39 | 47 |
| 40 // Get/sets the current display state of the button. | 48 // Get/sets the current display state of the button. |
| 41 ButtonState state() const { return state_; } | 49 ButtonState state() const { return state_; } |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 193 | 201 |
| 194 // The color of the ripple and hover. | 202 // The color of the ripple and hover. |
| 195 SkColor ink_drop_base_color_; | 203 SkColor ink_drop_base_color_; |
| 196 | 204 |
| 197 DISALLOW_COPY_AND_ASSIGN(CustomButton); | 205 DISALLOW_COPY_AND_ASSIGN(CustomButton); |
| 198 }; | 206 }; |
| 199 | 207 |
| 200 } // namespace views | 208 } // namespace views |
| 201 | 209 |
| 202 #endif // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ | 210 #endif // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ |
| OLD | NEW |