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

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

Issue 15061006: views: Switch Checkbox over to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: almost working - :p Created 7 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_
7 7
8 #include "ui/views/view.h" 8 #include "ui/views/view.h"
9 9
10 namespace views { 10 namespace views {
(...skipping 21 matching lines...) Expand all
32 // TODO(msw): Add toggled state for checkboxes, radio buttons, etc. 32 // TODO(msw): Add toggled state for checkboxes, radio buttons, etc.
33 enum ButtonState { 33 enum ButtonState {
34 STATE_NORMAL = 0, 34 STATE_NORMAL = 0,
35 STATE_HOVERED, 35 STATE_HOVERED,
36 STATE_PRESSED, 36 STATE_PRESSED,
37 STATE_DISABLED, 37 STATE_DISABLED,
38 STATE_COUNT, 38 STATE_COUNT,
39 }; 39 };
40 40
41 // Button styles with associated images and border painters. 41 // Button styles with associated images and border painters.
42 // TODO(msw): Add "Blue Button", Checkbox, Radio, Menu, ComboBox, etc. 42 // TODO(msw): Add "Blue Button", Checkbox, Radio, Menu, ComboBox, etc.
msw 2013/05/13 01:37:22 nit: update my TODO :)
tfarina 2013/05/13 01:47:12 Done.
43 enum ButtonStyle { 43 enum ButtonStyle {
44 STYLE_BUTTON = 0, 44 STYLE_BUTTON = 0,
45 STYLE_TEXTBUTTON, 45 STYLE_TEXTBUTTON,
46 STYLE_NATIVE_TEXTBUTTON, 46 STYLE_NATIVE_TEXTBUTTON,
47 STYLE_CHECKBOX,
48 STYLE_RADIO_BUTTON,
msw 2013/05/13 01:37:22 nit: consider STYLE_RADIO.
tfarina 2013/05/13 01:47:12 Done.
47 STYLE_COUNT, 49 STYLE_COUNT,
48 }; 50 };
49 51
50 void SetTooltipText(const string16& tooltip_text); 52 void SetTooltipText(const string16& tooltip_text);
51 53
52 int tag() const { return tag_; } 54 int tag() const { return tag_; }
53 void set_tag(int tag) { tag_ = tag; } 55 void set_tag(int tag) { tag_ = tag; }
54 56
55 void SetAccessibleName(const string16& name); 57 void SetAccessibleName(const string16& name);
56 58
(...skipping 24 matching lines...) Expand all
81 // The id tag associated with this button. Used to disambiguate buttons in 83 // The id tag associated with this button. Used to disambiguate buttons in
82 // the ButtonListener implementation. 84 // the ButtonListener implementation.
83 int tag_; 85 int tag_;
84 86
85 DISALLOW_COPY_AND_ASSIGN(Button); 87 DISALLOW_COPY_AND_ASSIGN(Button);
86 }; 88 };
87 89
88 } // namespace views 90 } // namespace views
89 91
90 #endif // UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_ 92 #endif // UI_VIEWS_CONTROLS_BUTTON_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698