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

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

Issue 12330002: Add views::Button style enum for LabelButton [native] styling, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge. Created 7 years, 10 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
« no previous file with comments | « ui/views/controls/button/button.h ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/custom_button.h
diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h
index bb3a6a27340efcc63b109ad0f99659c5ea406ec4..c44d3c8df2fb04b119d913e94e078f459c6cda32 100644
--- a/ui/views/controls/button/custom_button.h
+++ b/ui/views/controls/button/custom_button.h
@@ -31,15 +31,6 @@ class VIEWS_EXPORT CustomButton : public Button,
virtual ~CustomButton();
- // Possible states
- enum ButtonState {
- STATE_NORMAL = 0,
- STATE_HOVERED,
- STATE_PRESSED,
- STATE_DISABLED,
- STATE_COUNT
- };
-
// Get/sets the current display state of the button.
ButtonState state() const { return state_; }
void SetState(ButtonState state);
@@ -158,7 +149,7 @@ class VIEWS_EXPORT CustomButton : public Button,
class VIEWS_EXPORT CustomButtonStateChangedDelegate {
public:
virtual ~CustomButtonStateChangedDelegate() {}
- virtual void StateChanged(CustomButton::ButtonState state) = 0;
+ virtual void StateChanged(Button::ButtonState state) = 0;
protected:
CustomButtonStateChangedDelegate() {}
« no previous file with comments | « ui/views/controls/button/button.h ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698