summaryrefslogtreecommitdiffstats
path: root/ui/views/controls
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 14:16:38 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-25 14:16:38 +0000
commitddf1a01a4c451758eccf918c7670f41598254546 (patch)
tree098912af32548e0af5f768dda647429666823230 /ui/views/controls
parent2922b77587d0827219363d76379fc1044c89509a (diff)
downloadchromium_src-ddf1a01a4c451758eccf918c7670f41598254546.zip
chromium_src-ddf1a01a4c451758eccf918c7670f41598254546.tar.gz
chromium_src-ddf1a01a4c451758eccf918c7670f41598254546.tar.bz2
views: Fix var names of ToggleImageButton::SetImage() function.
R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10207031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls')
-rw-r--r--ui/views/controls/button/image_button.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h
index 3085869..ed0c80e 100644
--- a/ui/views/controls/button/image_button.h
+++ b/ui/views/controls/button/image_button.h
@@ -20,6 +20,18 @@ namespace views {
class VIEWS_EXPORT ImageButton : public CustomButton {
public:
+ enum HorizontalAlignment {
+ ALIGN_LEFT = 0,
+ ALIGN_CENTER,
+ ALIGN_RIGHT
+ };
+
+ enum VerticalAlignment {
+ ALIGN_TOP = 0,
+ ALIGN_MIDDLE,
+ ALIGN_BOTTOM
+ };
+
explicit ImageButton(ButtonListener* listener);
virtual ~ImageButton();
@@ -35,14 +47,6 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
// Pass NULL for no image.
void SetOverlayImage(const SkBitmap* image);
- enum HorizontalAlignment { ALIGN_LEFT = 0,
- ALIGN_CENTER,
- ALIGN_RIGHT, };
-
- enum VerticalAlignment { ALIGN_TOP = 0,
- ALIGN_MIDDLE,
- ALIGN_BOTTOM };
-
// Sets how the image is laid out within the button's bounds.
void SetImageAlignment(HorizontalAlignment h_align,
VerticalAlignment v_align);
@@ -106,7 +110,7 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton {
void SetToggledTooltipText(const string16& tooltip);
// Overridden from ImageButton:
- virtual void SetImage(ButtonState aState, const SkBitmap* anImage) OVERRIDE;
+ virtual void SetImage(ButtonState state, const SkBitmap* image) OVERRIDE;
// Overridden from View:
virtual bool GetTooltipText(const gfx::Point& p,